Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(SimpleFileChannel): unify default "flush" to be false as it is in FileChannel #4622

Merged
merged 1 commit into from
Aug 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Foundation/include/Poco/SimpleFileChannel.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class Foundation_API SimpleFileChannel: public Channel
/// The flush property specifies whether each log message is flushed
/// immediately to the log file (which may hurt application performance,
/// but ensures that everything is in the log in case of a system crash),
// or whether it's allowed to stay in the system's file buffer for some time.
/// or whether it's allowed to stay in the system's file buffer for some time.
/// Valid values are:
///
/// * true: Every message is immediately flushed to the log file (default).
Expand All @@ -86,16 +86,16 @@ class Foundation_API SimpleFileChannel: public Channel
SimpleFileChannel(const std::string& path);
/// Creates the FileChannel for a file with the given path.

void open();
void open() override;
/// Opens the FileChannel and creates the log file if necessary.

void close();
void close() override;
/// Closes the FileChannel.

void log(const Message& msg);
void log(const Message& msg) override;
/// Logs the given message to the file.

void setProperty(const std::string& name, const std::string& value);
void setProperty(const std::string& name, const std::string& value) override;
/// Sets the property with the given name.
///
/// The following properties are supported:
Expand All @@ -107,7 +107,7 @@ class Foundation_API SimpleFileChannel: public Channel
/// flushed to the log file. See the SimpleFileChannel
/// class for details.

std::string getProperty(const std::string& name) const;
std::string getProperty(const std::string& name) const override;
/// Returns the value of the property with the given name.
/// See setProperty() for a description of the supported
/// properties.
Expand All @@ -130,7 +130,7 @@ class Foundation_API SimpleFileChannel: public Channel
static const std::string PROP_FLUSH;

protected:
~SimpleFileChannel();
~SimpleFileChannel() override;
void setRotation(const std::string& rotation);
void setFlush(const std::string& flush);
void rotate();
Expand Down
12 changes: 6 additions & 6 deletions Foundation/src/SimpleFileChannel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ const std::string SimpleFileChannel::PROP_FLUSH = "flush";

SimpleFileChannel::SimpleFileChannel():
_limit(0),
_flush(true),
_pFile(0)
_flush(false),
_pFile(nullptr)
{
}

Expand All @@ -42,8 +42,8 @@ SimpleFileChannel::SimpleFileChannel(const std::string& path):
_path(path),
_secondaryPath(path + ".0"),
_limit(0),
_flush(true),
_pFile(0)
_flush(false),
_pFile(nullptr)
{
}

Expand Down Expand Up @@ -86,7 +86,7 @@ void SimpleFileChannel::close()
FastMutex::ScopedLock lock(_mutex);

delete _pFile;
_pFile = 0;
_pFile = nullptr;
}


Expand Down Expand Up @@ -134,7 +134,7 @@ std::string SimpleFileChannel::getProperty(const std::string& name) const
else if (name == PROP_ROTATION)
return _rotation;
else if (name == PROP_FLUSH)
return std::string(_flush ? "true" : "false");
return (_flush ? "true"s : "false"s);
else
return Channel::getProperty(name);
}
Expand Down
Loading