generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-17 07:13:27 +02:00
Code Issues Projects Releases Wiki Activity

Syslog: Include Facility to Syslog Message (#3452)

Browse Source 
* Fixed indentation

* Added Facility to Message in RemoteSyslogListener
This commit is contained in:
BeBinder 2022-05-30 04:28:08 +02:00 committed by GitHub
parent 980cd0273b
commit 2aaa7f851d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 106 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Net/include/Poco/Net/RemoteSyslogChannel.h
View File

@ -132,6 +132,9 @@ public:
static void registerChannel();
/// Registers the channel with the global LoggingFactory.
static const char* facilityToString(Facility facility);
/// Returns the string describing the SyslogFacility
static const std::string PROP_NAME;
static const std::string PROP_FACILITY;
static const std::string PROP_FORMAT;

5
Net/include/Poco/Net/RemoteSyslogListener.h
View File

@ -110,8 +110,9 @@ public:
static const std::string PROP_THREADS;
static const std::string PROP_BUFFER;
static const std::string LOG_PROP_APP;
static const std::string LOG_PROP_HOST;
static const std::string LOG_PROP_FACILITY;
static const std::string LOG_PROP_APP;
static const std::string LOG_PROP_HOST;
static const std::string LOG_PROP_STRUCTURED_DATA;
protected:

57
Net/src/RemoteSyslogChannel.cpp
View File

@ -362,6 +362,63 @@ int RemoteSyslogChannel::getPrio(const Message& msg)
}
}
const char* RemoteSyslogChannel::facilityToString(const Facility facility)
{
switch(facility)
{
case RemoteSyslogChannel::SYSLOG_KERN:
return "KERN";
case RemoteSyslogChannel::SYSLOG_USER:
return "USER";
case RemoteSyslogChannel::SYSLOG_MAIL:
return "MAIL";
case RemoteSyslogChannel::SYSLOG_DAEMON:
return "DAEMON";
case RemoteSyslogChannel::SYSLOG_AUTH:
return "AUTH";
case RemoteSyslogChannel::SYSLOG_SYSLOG:
return "SYSLOG";
case RemoteSyslogChannel::SYSLOG_LPR:
return "LPR";
case RemoteSyslogChannel::SYSLOG_NEWS:
return "NEWS";
case RemoteSyslogChannel::SYSLOG_UUCP:
return "UUCP";
case RemoteSyslogChannel::SYSLOG_CRON:
return "CRON";
case RemoteSyslogChannel::SYSLOG_AUTHPRIV:
return "AUTHPRIV";
case RemoteSyslogChannel::SYSLOG_FTP:
return "FTP";
case RemoteSyslogChannel::SYSLOG_NTP:
return "NTP";
case RemoteSyslogChannel::SYSLOG_LOGAUDIT:
return "LOGAUDIT";
case RemoteSyslogChannel::SYSLOG_LOGALERT:
return "LOGALERT";
case RemoteSyslogChannel::SYSLOG_CLOCK:
return "CLOCK";
case RemoteSyslogChannel::SYSLOG_LOCAL0:
return "LOCAL0";
case RemoteSyslogChannel::SYSLOG_LOCAL1:
return "LOCAL1";
case RemoteSyslogChannel::SYSLOG_LOCAL2:
return "LOCAL2";
case RemoteSyslogChannel::SYSLOG_LOCAL3:
return "LOCAL3";
case RemoteSyslogChannel::SYSLOG_LOCAL4:
return "LOCAL4";
case RemoteSyslogChannel::SYSLOG_LOCAL5:
return "LOCAL5";
case RemoteSyslogChannel::SYSLOG_LOCAL6:
return "LOCAL6";
case RemoteSyslogChannel::SYSLOG_LOCAL7:
return "LOCAL7";
default:
return "";
}
}
void RemoteSyslogChannel::registerChannel()
{

3
Net/src/RemoteSyslogListener.cpp
View File

@ -312,6 +312,7 @@ void SyslogParser::parseNew(const std::string& line, RemoteSyslogChannel::Severi
int tzd = 0;
bool hasDate = Poco::DateTimeParser::tryParse(RemoteSyslogChannel::SYSLOG_TIMEFORMAT, timeStr, date, tzd);
Poco::Message logEntry(msgId, messageText, prio);
logEntry[RemoteSyslogListener::LOG_PROP_FACILITY] = RemoteSyslogChannel::facilityToString(fac);
logEntry[RemoteSyslogListener::LOG_PROP_HOST] = hostName;
logEntry[RemoteSyslogListener::LOG_PROP_APP] = appName;
logEntry[RemoteSyslogListener::LOG_PROP_STRUCTURED_DATA] = sd;
@ -390,6 +391,7 @@ void SyslogParser::parseBSD(const std::string& line, RemoteSyslogChannel::Severi
pos = line.size();
Poco::Message logEntry(hostName, messageText, prio);
logEntry.setTime(date.timestamp());
logEntry[RemoteSyslogListener::LOG_PROP_FACILITY] = RemoteSyslogChannel::facilityToString(fac);
message.swap(logEntry);
}
@ -501,6 +503,7 @@ const std::string RemoteSyslogListener::PROP_REUSE_PORT("reusePort");
const std::string RemoteSyslogListener::PROP_THREADS("threads");
const std::string RemoteSyslogListener::PROP_BUFFER("buffer");
const std::string RemoteSyslogListener::LOG_PROP_FACILITY("facility");
const std::string RemoteSyslogListener::LOG_PROP_APP("app");
const std::string RemoteSyslogListener::LOG_PROP_HOST("host");
const std::string RemoteSyslogListener::LOG_PROP_STRUCTURED_DATA("structured-data");

39
Net/testsuite/src/SyslogTest.cpp
View File

@ -145,6 +145,44 @@ void SyslogTest::testListener()
assertTrue (msgs[0].getPriority() == Poco::Message::PRIO_CRITICAL);
}
void SyslogTest::testChannelFacility()
{
Poco::AutoPtr<RemoteSyslogChannel> channel = new RemoteSyslogChannel();
channel->setProperty("loghost", "127.0.0.1:51400");
channel->setProperty("facility", "KERN");
channel->open();
Poco::AutoPtr<RemoteSyslogListener> listener = new RemoteSyslogListener(51400);
listener->open();
auto pCL = Poco::makeAuto<CachingChannel>();
listener->addChannel(pCL);
assertTrue (pCL->getCurrentSize() == 0);
Poco::Message msg("asource", "amessage", Poco::Message::PRIO_CRITICAL);
channel->log(msg);
channel->setProperty("facility", "USER");
msg.setText("asecondmessage");
channel->log(msg);
assertFalse (msg.has("facility"));
Poco::Thread::sleep(1000);
listener->close();
channel->close();
assertTrue (pCL->getCurrentSize() == 2);
std::vector<Poco::Message> msgs;
pCL->getMessages(msgs, 0, 10);
assertTrue (msgs.size() == 2);
assertTrue (msgs[1].getSource() == "asource");
assertTrue (msgs[1].getText() == "amessage");
assertTrue (msgs[1].getPriority() == Poco::Message::PRIO_CRITICAL);
assertTrue (msgs[1].has("facility"));
assertTrue (msgs[1].get("facility") == "KERN");
assertTrue (msgs[0].getSource() == "asource");
assertTrue (msgs[0].getText() == "asecondmessage");
assertTrue (msgs[0].getPriority() == Poco::Message::PRIO_CRITICAL);
assertTrue (msgs[0].has("facility"));
assertTrue (msgs[0].get("facility") == "USER");
}
void SyslogTest::testChannelOpenClose()
{
@ -263,6 +301,7 @@ CppUnit::Test* SyslogTest::suite()
CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("SyslogTest");
CppUnit_addTest(pSuite, SyslogTest, testListener);
CppUnit_addTest(pSuite, SyslogTest, testChannelFacility);
CppUnit_addTest(pSuite, SyslogTest, testChannelOpenClose);
CppUnit_addTest(pSuite, SyslogTest, testOldBSD);
CppUnit_addTest(pSuite, SyslogTest, testStructuredData);

1
Net/testsuite/src/SyslogTest.h
View File

@ -25,6 +25,7 @@ public:
~SyslogTest();
void testListener();
void testChannelFacility();
void testChannelOpenClose();
void testOldBSD();
void testStructuredData();