Changeset 2466

Timestamp:

24/03/2009 16:55:46 (3 years ago)

Author:

chris

Message:

Add ability to specify a named log facility for syslog loggins,
requested by Kenny Millington.

Location:

box/trunk/lib

Files:

• common/Logging.cpp (modified) (3 diffs)
• common/Logging.h (modified) (3 diffs)
• server/Daemon.cpp (modified) (1 diff)
• server/Daemon.h (modified) (1 diff)

box/trunk/lib/common/Logging.cpp

@@ -217 +217 @@
 }
 
+void Logging::SetFacility(int facility)
+{
+        spSyslog->SetFacility(facility);
+}
+
 Logger::Logger() 
 : mCurrentLevel(Log::EVERYTHING) 
@@ -391 +396 @@
 }
 
-Syslog::Syslog()
-{
-        ::openlog("Box Backup", LOG_PID, LOG_LOCAL6);
+Syslog::Syslog() : mFacility(LOG_LOCAL6)
+{
+        ::openlog("Box Backup", LOG_PID, mFacility);
 }
 
@@ -405 +410 @@
         mName = rProgramName;
         ::closelog();
-        ::openlog(mName.c_str(), LOG_PID, LOG_LOCAL6);
+        ::openlog(mName.c_str(), LOG_PID, mFacility);
+}
+
+void Syslog::SetFacility(int facility)
+{
+        mFacility = facility;
+        ::closelog();
+        ::openlog(mName.c_str(), LOG_PID, mFacility);
+}
+
+int Syslog::GetNamedFacility(const std::string& rFacility)
+{
+        #define CASE_RETURN(x) if (rFacility == #x) { return LOG_ ## x; }
+        CASE_RETURN(LOCAL0)
+        CASE_RETURN(LOCAL1)
+        CASE_RETURN(LOCAL2)
+        CASE_RETURN(LOCAL3)
+        CASE_RETURN(LOCAL4)
+        CASE_RETURN(LOCAL5)
+        CASE_RETURN(LOCAL6)
+        CASE_RETURN(DAEMON)
+        #undef CASE_RETURN
+
+        BOX_ERROR("Unknown log facility '" << rFacility << "', "
+                "using default LOCAL6");
+        return LOG_LOCAL6;
 }
 

box/trunk/lib/common/Logging.h

@@ -203 +203 @@
         private:
         std::string mName;
+        int mFacility;
 
         public:
@@ -212 +213 @@
         virtual const char* GetType() { return "Syslog"; }
         virtual void SetProgramName(const std::string& rProgramName);
+        virtual void SetFacility(int facility);
+        static int GetNamedFacility(const std::string& rFacility);
 };
 
@@ -261 +264 @@
         static void SetProgramName(const std::string& rProgramName);
         static std::string GetProgramName() { return sProgramName; }
+        static void SetFacility(int facility);
 
         class Guard

box/trunk/lib/server/Daemon.cpp

@@ -481 +481 @@
                         mapConfiguration->GetSubConfiguration("Server"));
 
+                if(serverConfig.KeyExists("LogFacility"))
+                {
+                        std::string facility =
+                                serverConfig.GetKeyValue("LogFacility");
+                        Logging::SetFacility(Syslog::GetNamedFacility(facility));
+                }
+
                 // Open PID file for writing
                 pidFileName = serverConfig.GetKeyValue("PidFile");

box/trunk/lib/server/Daemon.h

@@ -106 +106 @@
 #define DAEMON_VERIFY_SERVER_KEYS \
         ConfigurationVerifyKey("PidFile", ConfigTest_Exists), \
+        ConfigurationVerifyKey("LogFacility", 0), \
         ConfigurationVerifyKey("User", ConfigTest_LastEntry)