generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-06-06 22:44:57 +02:00
Code Issues Projects Releases Wiki Activity

Pattern Formatter Priority Name Enhancement

Browse Source 
Added a property to allow the user to specify the actual names for the
priorities that will go into the log.
This commit is contained in:
Don Edvalson 2015-08-14 09:16:05 -04:00
parent 7f6e38438c
commit 5c20361005
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Foundation/include/Poco/PatternFormatter.h
View File

@ -116,9 +116,10 @@ public:
static const std::string PROP_PATTERN; static const std::string PROP_PATTERN;
static const std::string PROP_TIMES; static const std::string PROP_TIMES;
static const std::string PROP_PRIORITY_NAMES;
protected: protected:
static const std::string& getPriorityName(int); const std::string& getPriorityName(int);
/// Returns a string for the given priority value. /// Returns a string for the given priority value.
private: private:
@ -139,9 +140,13 @@ private:
/// which contains the message key, any text that needs to be written first /// which contains the message key, any text that needs to be written first
/// a property in case of %[] and required length. /// a property in case of %[] and required length.
void parsePriorityNames();
std::vector<PatternAction> _patternActions; std::vector<PatternAction> _patternActions;
bool _localTime; bool _localTime;
std::string _pattern; std::string _pattern;
std::string _priorityNames;
std::string _priorities[9];
}; };

22
Foundation/src/PatternFormatter.cpp
View File

@ -24,6 +24,7 @@
#include "Poco/Timezone.h" #include "Poco/Timezone.h"
#include "Poco/Environment.h" #include "Poco/Environment.h"
#include "Poco/NumberParser.h" #include "Poco/NumberParser.h"
#include "Poco/StringTokenizer.h"
namespace Poco { namespace Poco {
@ -31,11 +32,13 @@ namespace Poco {
const std::string PatternFormatter::PROP_PATTERN = "pattern"; const std::string PatternFormatter::PROP_PATTERN = "pattern";
const std::string PatternFormatter::PROP_TIMES = "times"; const std::string PatternFormatter::PROP_TIMES = "times";
const std::string PatternFormatter::PROP_PRIORITY_NAMES = "priorityNames";
PatternFormatter::PatternFormatter(): PatternFormatter::PatternFormatter():
_localTime(false) _localTime(false)
{ {
parsePriorityNames();
} }
@ -43,6 +46,7 @@ PatternFormatter::PatternFormatter(const std::string& format):
_localTime(false), _localTime(false),
_pattern(format) _pattern(format)
{ {
parsePriorityNames();
parsePattern(); parsePattern();
} }
@ -204,6 +208,11 @@ void PatternFormatter::setProperty(const std::string& name, const std::string& v
{ {
_localTime = (value == "local"); _localTime = (value == "local");
} }
else if (name == PROP_PRIORITY_NAMES)
{
_priorityNames = value;
parsePriorityNames();
}
else else
{ {
Formatter::setProperty(name, value); Formatter::setProperty(name, value);
@ -217,6 +226,8 @@ std::string PatternFormatter::getProperty(const std::string& name) const
return _pattern; return _pattern;
else if (name == PROP_TIMES) else if (name == PROP_TIMES)
return _localTime ? "local" : "UTC"; return _localTime ? "local" : "UTC";
else if (name == PROP_PRIORITY_NAMES)
return _priorityNames;
else else
return Formatter::getProperty(name); return Formatter::getProperty(name);
} }
@ -238,11 +249,20 @@ namespace
}; };
} }
void PatternFormatter::parsePriorityNames()
{
for (int i = 0; i <= 8; i++)
_priorities[i] = priorities[i];
StringTokenizer st (_priorityNames, ".", StringTokenizer::TOK_TRIM);
if (st.count() == 8)
for (int i = 1; i <= 8; i++)
_priorities[i] = st[i-1];
}
const std::string& PatternFormatter::getPriorityName(int prio) const std::string& PatternFormatter::getPriorityName(int prio)
{ {
poco_assert (1 <= prio && prio <= 8); poco_assert (1 <= prio && prio <= 8);
return priorities[prio]; return _priorities[prio];
} }