This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Log4cpp Git repository.".
The branch, log4cpp-patch-45 has been updated
via fe4ed077cd0bf6f5f45666c9ba93f8e9b509c7c6 (commit)
via 14babda4ecebcb6ded0938d21e255a82a93d2b34 (commit)
from c7d21d8d69248a47e8ef4df1e2f977591466fd0a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceforge.net/p/log4cpp/codegit/ci/
commit c209a977e66702678feda52cbf8b2125532d4799
Author: Alexander Perepelkin <san...@us...>
Date: Tue Aug 2 22:43:45 2016 +0400
bug-141: conservative fix
diff --git a/src/PropertyConfiguratorImpl.cpp b/src/PropertyConfiguratorImpl.cpp
index d9fec49..a8db7c9 100644
--- a/src/PropertyConfiguratorImpl.cpp
+++ b/src/PropertyConfiguratorImpl.cpp
@@ -166,7 +166,12 @@ namespace log4cpp {
}
}
- category.setPriority(priority);
+ try {
+ category.setPriority(priority);
+ } catch (std::invalid_argument& e) {
+ throw ConfigureFailure(std::string(e.what()) +
+ " for category '" + categoryName + "'");
+ }
bool additive = _properties.getBool("additivity." + categoryName, true);
category.setAdditivity(additive);
http://sourceforge.net/p/log4cpp/codegit/ci/
commit c209a977e66702678feda52cbf8b2125532d4799
Author: Alexander Perepelkin <san...@us...>
Date: Tue Aug 2 22:43:45 2016 +0400
bug-141: conservative fix
diff --git a/src/PropertyConfiguratorImpl.cpp b/src/PropertyConfiguratorImpl.cpp
index d9fec49..a8db7c9 100644
--- a/src/PropertyConfiguratorImpl.cpp
+++ b/src/PropertyConfiguratorImpl.cpp
@@ -166,7 +166,12 @@ namespace log4cpp {
}
}
- category.setPriority(priority);
+ try {
+ category.setPriority(priority);
+ } catch (std::invalid_argument& e) {
+ throw ConfigureFailure(std::string(e.what()) +
+ " for category '" + categoryName + "'");
+ }
bool additive = _properties.getBool("additivity." + categoryName, true);
category.setAdditivity(additive);
-----------------------------------------------------------------------
Summary of changes:
src/RemoteSyslogAppender.cpp | 10 ++++++++--
tests/Clock.hh | 2 ++
2 files changed, 10 insertions(+), 2 deletions(-)
hooks/post-receive
--
Log4cpp Git repository.
|