arpadboda commented on a change in pull request #596: MINIFICPP-925 - Fix
TailFile hang on long lines
URL: https://github.com/apache/nifi-minifi-cpp/pull/596#discussion_r299895468
##########
File path: extensions/standard-processors/processors/LogAttribute.h
##########
@@ -89,27 +89,23 @@ class LogAttribute : public core::Processor {
// Nest Callback Class for read stream
class ReadCallback : public InputStreamCallback {
public:
- ReadCallback(uint64_t size)
- : read_size_(0) {
- buffer_size_ = size;
- buffer_ = new uint8_t[buffer_size_];
- }
- ~ReadCallback() {
- if (buffer_)
- delete[] buffer_;
+ ReadCallback(std::shared_ptr<logging::Logger> logger, uint64_t size)
+ : logger_(std::move(logger))
+ , buffer_(size) {
}
int64_t process(std::shared_ptr<io::BaseStream> stream) {
- int64_t ret = 0;
- ret = stream->read(buffer_, buffer_size_);
- if (!stream)
- read_size_ = stream->getSize();
- else
- read_size_ = buffer_size_;
- return ret;
+ if (buffer_.size() == 0U) {
+ return 0U;
+ }
+ int ret = stream->read(buffer_.data(), buffer_.size());
+ if (ret != buffer_.size()) {
+ logger_->log_error("%zu bytes were requested from the stream but %d
bytes were read. Rolling back.", buffer_.size(), ret);
+ throw std::exception();
Review comment:
Is this the most appropriate exception we can throw?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
