[cpp-log4shib] branch master updated: Make EventLogAppender layout-capable.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-log4shib.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-log4shib.git;a=commit;h=c59d0600ad59edf7da918f74d68b211cd3af691e

The following commit(s) were added to refs/heads/master by this push:
       new  c59d060   Make EventLogAppender layout-capable.
c59d060 is described below

commit c59d0600ad59edf7da918f74d68b211cd3af691e
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Apr 20 13:48:35 2018 -0400

    Make EventLogAppender layout-capable.
---
 include/log4shib/NTEventLogAppender.hh | 12 ++----------
 src/NTEventLogAppender.cpp             | 14 ++++----------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/include/log4shib/NTEventLogAppender.hh b/include/log4shib/NTEventLogAppender.hh
index 058c8d0..4a18114 100644
--- a/include/log4shib/NTEventLogAppender.hh
+++ b/include/log4shib/NTEventLogAppender.hh
@@ -36,7 +36,7 @@
 #endif // done dealing with ERROR #define
 
 #include <log4shib/Portability.hh>
-#include <log4shib/AppenderSkeleton.hh>
+#include <log4shib/LayoutAppender.hh>
 
 namespace log4shib {
 
@@ -49,7 +49,7 @@ namespace log4shib {
      * correctly in Event Viewer.<BR>
      * <B>NB:</B> This class is only available on Win32 platforms.
      **/
-    class LOG4SHIB_EXPORT NTEventLogAppender : public AppenderSkeleton {
+    class LOG4SHIB_EXPORT NTEventLogAppender : public LayoutAppender {
     public:
 
         /**
@@ -67,14 +67,6 @@ namespace log4shib {
 
         virtual void close();
 
-        /**
-         * The NTEventLogAppender does its own Layout.
-         * @returns false
-         **/
-        virtual bool requiresLayout() const;
-
-        virtual void setLayout(Layout* layout);
-
     protected:
         
         WORD getCategory(Priority::Value priority);
diff --git a/src/NTEventLogAppender.cpp b/src/NTEventLogAppender.cpp
index 8f66b7f..59dd9b4 100644
--- a/src/NTEventLogAppender.cpp
+++ b/src/NTEventLogAppender.cpp
@@ -9,7 +9,7 @@
 namespace log4shib {
 
     NTEventLogAppender::NTEventLogAppender(const std::string& name, const std::string& sourceName) :
-    AppenderSkeleton(name),
+    LayoutAppender(name),
     _strSourceName(sourceName),
     _hEventSource(NULL)
     {
@@ -42,17 +42,11 @@ namespace log4shib {
         return true;
     }      
 
-    bool NTEventLogAppender::requiresLayout() const {
-        return false;
-    }
-
-    void NTEventLogAppender::setLayout(Layout* layout) {
-        return;
-    }
-
     void NTEventLogAppender::_append(const LoggingEvent& event) {
+        std::string message(_getLayout().format(event));
+
         const char* ps[1];
-        ps[0] = event.message.c_str();
+        ps[0] = message.c_str();
 
         ::ReportEvent(_hEventSource, getType(event.priority), 
 	          getCategory(event.priority), 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.