merge from ronnie

[vlendec/samba-autobuild/.git] / ctdb / server / ctdb_logging.c

diff --git a/ctdb/server/ctdb_logging.c b/ctdb/server/ctdb_logging.c
index 9f7f6b3bb9320e017d6ed5308a6005835e72965e..6ebc8c178106acc0aa9dadf4e82c5f0bfcecfa26 100644 (file)
--- a/ctdb/server/ctdb_logging.c
+++ b/ctdb/server/ctdb_logging.c
@@ -40,7 +40,34 @@ static struct ctdb_log_state *log_state;
  */
 static void ctdb_syslog_log(const char *format, va_list ap)
 {
-       vsyslog(LOG_NOTICE, format, ap);
+       int level = LOG_DEBUG;
+       switch (this_log_level) {
+       case DEBUG_EMERG: 
+               level = LOG_EMERG; 
+               break;
+       case DEBUG_ALERT: 
+               level = LOG_ALERT; 
+               break;
+       case DEBUG_CRIT: 
+               level = LOG_CRIT; 
+               break;
+       case DEBUG_ERR: 
+               level = LOG_ERR; 
+               break;
+       case DEBUG_WARNING: 
+               level = LOG_WARNING; 
+               break;
+       case DEBUG_NOTICE: 
+               level = LOG_NOTICE;
+               break;
+       case DEBUG_INFO: 
+               level = LOG_INFO;
+               break;
+       default:
+               level = LOG_DEBUG;
+               break;          
+       }
+       vsyslog(level, format, ap);
 }
 
 
@@ -161,7 +188,7 @@ int ctdb_set_child_logging(struct ctdb_context *ctdb)
 
        /* setup a pipe to catch IO from subprocesses */
        if (pipe(p) != 0) {
-               DEBUG(0,(__location__ " Failed to setup for child logging pipe\n"));
+               DEBUG(DEBUG_ERR,(__location__ " Failed to setup for child logging pipe\n"));
                return -1;
        }