log level

conf/master.cfg

@@ -11,5 +11,6 @@
     "max_simult_result_getters" : 100,
     "max_simult_command_send" : 100,
     "ipv6" : false,
-    "masterdb" : "localhost"
+    "masterdb" : "localhost",
+    "log_level" : "info"
 }

conf/worker.cfg

@@ -7,5 +7,6 @@
     "js" : "/usr/bin/node",
     "pidfile" : "/var/run/pworker.pid",
     "completion_ping_delay" : 1,
-    "ipv6" : false
+    "ipv6" : false,
+    "log_level" : "info"
 }

master.cfg

@@ -11,5 +11,6 @@
     "max_simult_result_getters" : 100,
     "max_simult_command_send" : 100,
     "ipv6" : false,
-    "masterdb" : "localhost"
+    "masterdb" : "localhost",
+    "log_level" : "debug"
 }

masterdb.cfg

@@ -1,5 +1,6 @@
 {
     "pidfile" : "masterdb.pid",
     "db_path" : "db",
-    "ipv6" : false
+    "ipv6" : false,
+    "log_level" : "debug"
 }

src/common/log.cpp

@@ -33,17 +33,34 @@ namespace common {
 namespace logger
 {
 
-bool isDaemon = false;
+bool useSyslog = false;
 const char *serviceName = "";
 bool isTerminal = false;
+LogLevel logLevel;
 
-
-void InitLogger( bool isDaemon, const char *serviceName )
+void InitLogger( bool useSyslog, const char *serviceName, const char *level )
 {
-    logger::isDaemon = isDaemon;
+    logger::useSyslog = useSyslog;
     logger::serviceName = serviceName;
 
-    if ( isDaemon )
+    if ( !strcasecmp( level, "debug" ) )
+        logLevel = LogLevel::DEBUG;
+    else
+    if ( !strcasecmp( level, "info" ) )
+        logLevel = LogLevel::INFO;
+    else
+    if ( !strcasecmp( level, "warning" ) )
+        logLevel = LogLevel::WARNING;
+    else
+    if ( !strcasecmp( level, "error" ) )
+        logLevel = LogLevel::ERROR;
+    else
+    {
+        std::cout << "InitLogger: unknown log level '" << level << "', using 'debug' by default" << std::endl;
+        logLevel = LogLevel::DEBUG;
+    }
+
+    if ( useSyslog )
     {
         openlog( serviceName, LOG_CONS, LOG_DAEMON );
     }
@@ -53,7 +70,7 @@ void InitLogger( bool isDaemon, const char *serviceName )
 
 void ShutdownLogger()
 {
-    if ( isDaemon )
+    if ( useSyslog )
     {
         closelog();
     }
@@ -87,7 +104,7 @@ void Print( char level, const char *msg )
 
 void Log( const char *msg )
 {
-    if ( isDaemon )
+    if ( useSyslog )
     {
         syslog( LOG_INFO, "%s", msg );
     }
@@ -99,7 +116,7 @@ void Log( const char *msg )
 
 void LogDebug( const char *msg )
 {
-    if ( isDaemon )
+    if ( useSyslog )
     {
         syslog( LOG_DEBUG, "%s", msg );
     }
@@ -111,7 +128,7 @@ void LogDebug( const char *msg )
 
 void LogWarning( const char *msg )
 {
-    if ( isDaemon )
+    if ( useSyslog )
     {
         syslog( LOG_WARNING, "%s", msg );
     }
@@ -123,7 +140,7 @@ void LogWarning( const char *msg )
 
 void LogError( const char *msg )
 {
-    if ( isDaemon )
+    if ( useSyslog )
     {
         syslog( LOG_ERR, "%s", msg );
     }
@@ -133,6 +150,11 @@ void LogError( const char *msg )
     }
 }
 
+bool CheckLogLevel( LogLevel want )
+{
+    return static_cast<int>(logLevel) <= static_cast<int>(want);
+}
+
 } // namespace logger
 
 } // namespace common

src/common/log.h

@@ -30,35 +30,43 @@ the License.
     os << MSG << "  (from " << __FILE__ << ':' << __LINE__ << ')';
 
 #define PLOG( MSG )\
-{\
-    PLOG_PREPARE_MESSAGE( MSG ); \
-    common::logger::Log( os.str().c_str() ); \
-}
+    if ( common::logger::CheckLogLevel( common::logger::LogLevel::INFO ) ) { \
+        PLOG_PREPARE_MESSAGE( MSG );                                    \
+        common::logger::Log( os.str().c_str() );                        \
+    }
 
 #define PLOG_DBG( MSG )\
-{\
-    PLOG_PREPARE_MESSAGE( MSG ); \
-    common::logger::LogDebug( os.str().c_str() ); \
-}
+    if ( common::logger::CheckLogLevel( common::logger::LogLevel::DEBUG ) ) { \
+        PLOG_PREPARE_MESSAGE( MSG );                                    \
+        common::logger::LogDebug( os.str().c_str() );                   \
+    }
 
 #define PLOG_WRN( MSG )\
-{\
-    PLOG_PREPARE_MESSAGE( MSG ); \
-    common::logger::LogWarning( os.str().c_str() ); \
-}
+    if ( common::logger::CheckLogLevel( common::logger::LogLevel::WARNING ) ) { \
+        PLOG_PREPARE_MESSAGE( MSG );                                    \
+        common::logger::LogWarning( os.str().c_str() );                 \
+    }
 
 #define PLOG_ERR( MSG )\
-{\
-    PLOG_PREPARE_MESSAGE( MSG ); \
-    common::logger::LogError( os.str().c_str() ); \
-}
+    if ( common::logger::CheckLogLevel( common::logger::LogLevel::ERROR ) ) { \
+        PLOG_PREPARE_MESSAGE( MSG );                                    \
+        common::logger::LogError( os.str().c_str() );                   \
+    }
 
 namespace common {
 
 namespace logger
 {
 
-void InitLogger( bool isDaemon, const char *serviceName );
+enum LogLevel
+{
+    DEBUG   = 0,
+    INFO    = 1,
+    WARNING = 2,
+    ERROR   = 3
+};
+
+void InitLogger( bool useSyslog, const char *serviceName, const char *level );
 
 void ShutdownLogger();
 
@@ -70,6 +78,8 @@ void LogWarning( const char *msg );
 
 void LogError( const char *msg );
 
+bool CheckLogLevel( LogLevel want );
+
 } // namespace logger
 
 } // namespace common

src/master/master.cpp

@@ -180,10 +180,6 @@ class MasterApplication
 
     void Initialize()
     {
-        common::logger::InitLogger( isDaemon_, "pmaster" );
-
-        PLOG_DBG( "MasterApplication::Initialize: master_id=" << masterId_ );
-
         SetupSignalHandlers();
         atexit( AtExit );
 
@@ -199,6 +195,11 @@ class MasterApplication
         }
         ApplyDefaults( cfg );
 
+        std::string logLevel = cfg.Get<std::string>( "log_level" );
+        common::logger::InitLogger( isDaemon_, "pmaster", logLevel.c_str() );
+
+        PLOG_DBG( "MasterApplication::Initialize: master_id=" << masterId_ );
+
         unsigned int numHeartbeatThread = 1;
         unsigned int numPingReceiverThread = cfg.Get<unsigned int>( "num_ping_receiver_thread" );
         unsigned int numJobSendThread = 1 + cfg.Get<unsigned int>( "num_job_send_thread" );

src/master/worker_manager.cpp

@@ -178,7 +178,7 @@ bool WorkerManager::GetAchievedTask( WorkerTask &worker, std::string &hostIP )
     if ( achievedWorkers_.empty() )
         return false;
 
-    PLOG( "GetAchievedWorker: num achieved workers=" << achievedWorkers_.size() );
+    PLOG_DBG( "GetAchievedWorker: num achieved workers=" << achievedWorkers_.size() );
 
     const PairTypeAW &w = achievedWorkers_.front();
     worker = w.first;

src/masterdb/masterdb.cpp

@@ -129,8 +129,6 @@ class MasterDbApplication
 
     void Initialize()
     {
-        common::logger::InitLogger( isDaemon_, "pmasterdb" );
-
         SetupSignalHandlers();
         atexit( AtExit );
 
@@ -146,6 +144,9 @@ class MasterDbApplication
         }
         ApplyDefaults( cfg );
 
+        std::string logLevel = cfg.Get<std::string>( "log_level" );
+        common::logger::InitLogger( isDaemon_, "pmasterdb", logLevel.c_str() );
+
         // initialize main components
         dbClient_.Initialize( exeDir_ );
 

src/worker/exec.cpp

@@ -1317,10 +1317,6 @@ class ExecApplication
 
     void Initialize()
     {
-        PLOG_DBG( "ExecApplication::Initialize" );
-
-        common::logger::InitLogger( isDaemon_, "prexec" );
-
         common::Config &cfg = common::Config::Instance();
         if ( cfgDir_.empty() )
         {
@@ -1331,6 +1327,11 @@ class ExecApplication
             cfg.ParseConfig( "", cfgDir_.c_str() );
         }
 
+        std::string logLevel = cfg.Get<std::string>( "log_level" );
+        common::logger::InitLogger( isDaemon_, "prexec", logLevel.c_str() );
+
+        PLOG_DBG( "ExecApplication::Initialize" );
+
         SetupLanguageRuntime( execContext_ );
 
         SetupPrExecIPC();

src/worker/worker.cpp

@@ -1010,15 +1010,11 @@ class WorkerApplication
 
     void Initialize()
     {
-        PLOG_DBG( "WorkerApplication::Initialize" );
-
         ComputerInfo &compInfo = ComputerInfo::Instance();
         unsigned int numExecThread = compInfo.GetNumCPU();
         numRequestThread_ = 2 * numExecThread;
         numThread_ = numRequestThread_ + 1; // +1 for accept thread
 
-        common::logger::InitLogger( isDaemon_, "pworker" );
-
         common::Config &cfg = common::Config::Instance();
         if ( cfgDir_.empty() )
         {
@@ -1030,6 +1026,11 @@ class WorkerApplication
         }
         ApplyDefaults( cfg );
 
+        std::string logLevel = cfg.Get<std::string>( "log_level" );
+        common::logger::InitLogger( isDaemon_, "pworker", logLevel.c_str() );
+
+        PLOG_DBG( "WorkerApplication::Initialize" );
+
         JobCompletionTable::Instance();
 
         SetupSignalHandlers();

worker.cfg

@@ -7,5 +7,6 @@
     "js" : "/usr/bin/node",
     "pidfile" : "worker.pid",
     "completion_ping_delay" : 1,
-    "ipv6" : false
+    "ipv6" : false,
+    "log_level" : "debug"
 }