generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-26 18:42:41 +01:00
Code Issues Projects Releases Wiki Activity

#2787: add queueSize property to the AsyncChannel

Browse Source
This commit is contained in:
Günter Obiltschnig
2020-02-04 10:53:01 +01:00
parent 81624a269f
commit c4bdadffb3
2 changed files with 63 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Foundation/include/Poco/AsyncChannel.h
View File

@@ -82,6 +82,20 @@ public:
/// * highest /// * highest
/// ///
/// The "priority" property is set-only. /// The "priority" property is set-only.
///
/// The "queueSize" property allows to limit the number
/// of messages in the queue. If the queue is full and
/// new messages are logged, these are dropped until the
/// queue has free capacity again. The number of dropped
/// messages is recorded, and a log message indicating the
/// number of dropped messages will be generated when the
/// queue has free capacity again.
/// In addition to an unsigned integer specifying the size,
/// this property can have the values "none" or "unlimited",
/// which disable the queue size limit. A size of 0 also
/// removes the limit.
///
/// The "queueSize" property is set-only.
protected: protected:
~AsyncChannel(); ~AsyncChannel();
@@ -89,11 +103,13 @@ protected:
void setPriority(const std::string& value); void setPriority(const std::string& value);
private: private:
Channel::Ptr _pChannel; Channel::Ptr _pChannel;
Thread _thread; Thread _thread;
FastMutex _threadMutex; FastMutex _threadMutex;
FastMutex _channelMutex; FastMutex _channelMutex;
NotificationQueue _queue; NotificationQueue _queue;
std::size_t _queueSize = 0;
std::size_t _dropCount = 0;
}; };

28
Foundation/src/AsyncChannel.cpp
View File

@@ -18,7 +18,10 @@
#include "Poco/Formatter.h" #include "Poco/Formatter.h"
#include "Poco/AutoPtr.h" #include "Poco/AutoPtr.h"
#include "Poco/LoggingRegistry.h" #include "Poco/LoggingRegistry.h"
#include "Poco/NumberParser.h"
#include "Poco/Exception.h" #include "Poco/Exception.h"
#include "Poco/String.h"
#include "Poco/Format.h"
namespace Poco { namespace Poco {
@@ -106,6 +109,18 @@ void AsyncChannel::close()
void AsyncChannel::log(const Message& msg) void AsyncChannel::log(const Message& msg)
{ {
if (_queueSize != 0 && _queue.size() >= _queueSize)
{
++_dropCount;
return;
}
if (_dropCount != 0)
{
_queue.enqueueNotification(new MessageNotification(Message(msg, Poco::format("Dropped %z messages.", _dropCount))));
_dropCount = 0;
}
open(); open();
_queue.enqueueNotification(new MessageNotification(msg)); _queue.enqueueNotification(new MessageNotification(msg));
@@ -115,11 +130,24 @@ void AsyncChannel::log(const Message& msg)
void AsyncChannel::setProperty(const std::string& name, const std::string& value) void AsyncChannel::setProperty(const std::string& name, const std::string& value)
{ {
if (name == "channel") if (name == "channel")
{
setChannel(LoggingRegistry::defaultRegistry().channelForName(value)); setChannel(LoggingRegistry::defaultRegistry().channelForName(value));
}
else if (name == "priority") else if (name == "priority")
{
setPriority(value); setPriority(value);
}
else if (name == "queueSize")
{
if (Poco::icompare(value, "none") == 0 || Poco::icompare(value, "unlimited") == 0 || value.empty())
_queueSize = 0;
else
_queueSize = Poco::NumberParser::parseUnsigned(value);
}
else else
{
Channel::setProperty(name, value); Channel::setProperty(name, value);
}
} }