use qblog instead of syslog

[pve-cluster.git] / data / src / cfs-utils.c

diff --git a/data/src/cfs-utils.c b/data/src/cfs-utils.c
index d3100216283ade50416b2026b11f099c117d9e30..721573db059ecc63d3301df65d775ae7cc9f1597 100644 (file)
--- a/data/src/cfs-utils.c
+++ b/data/src/cfs-utils.c
@@ -31,7 +31,7 @@
 #include <utime.h>
 #include <sys/stat.h>
 #include <glib.h>
-#include <sys/syslog.h>
+#include <qb/qblog.h>
 
 #include "cfs-utils.h"
 
@@ -116,15 +116,6 @@ cfs_log(
        const gchar    *format,
        ...)
 {
-       va_list args;
-
-       va_start (args, format);
-       char *orgmsg = g_strdup_vprintf (format, args);
-       va_end (args);
-
-       char msg[8192];
-       utf8_to_ascii(msg, sizeof(msg), orgmsg, FALSE);
-
        gint level; 
        char *ltxt;
 
@@ -160,82 +151,22 @@ cfs_log(
                ltxt = "info";
        } 
 
-       if (!file || (log_level == G_LOG_LEVEL_MESSAGE ||
-                     log_level == G_LOG_LEVEL_INFO)) {
-
-               if (log_domain) {
-                       syslog(level, "[%s] %s", log_domain, msg); 
-
-                       if (cfs.debug || cfs.print_to_console)
-                               printf("%s: [%s] %s\n", ltxt, log_domain, msg);
-               } else {
-                       syslog(level, msg); 
-
-                       if (cfs.debug || cfs.print_to_console)
-                               printf("%s: %s\n", ltxt, msg);
-
-               }
+       va_list args;
 
-       } else {
+       va_start (args, format);
+       char *orgmsg = g_strdup_vprintf (format, args);
+       va_end (args);
 
-               if (log_domain) {
-                       syslog(level, "[%s] %s (%s:%d:%s)", log_domain, msg, file, line, func); 
+       char msg[8192];
+       utf8_to_ascii(msg, sizeof(msg), orgmsg, FALSE);
 
-                       if (cfs.debug || cfs.print_to_console)
-                               printf("%s: [%s] %s (%s:%d:%s)\n", ltxt, log_domain, msg, file, line, func);
+       uint32_t tag = g_quark_from_string(log_domain);
 
-               } else {
-                       syslog(level, "%s (%s:%d:%s)", msg, file, line, func); 
-
-                       if (cfs.debug || cfs.print_to_console)
-                               printf("%s: %s (%s:%d:%s)\n", ltxt, msg, file, line, func);
-               }
-       }
+       qb_log_from_external_source(func, file, "%s", level, line, tag, msg);
 
        g_free(orgmsg);
 }
 
-void ipc_log_fn(
-       const char *file,
-       int32_t line, 
-       int32_t severity, 
-       const char *msg)
-{
-
-       if (!cfs.debug && 
-           !(severity == LOG_ERR || severity == LOG_CRIT || severity == LOG_WARNING))
-               return;
-
-       GLogLevelFlags log_level;
-
-       switch (severity) { 
-       case LOG_ERR:
-               log_level = G_LOG_LEVEL_ERROR;
-               break; 
-       case LOG_CRIT:
-               log_level = G_LOG_LEVEL_CRITICAL; 
-               break; 
-       case LOG_WARNING:
-               log_level = G_LOG_LEVEL_WARNING;
-               break; 
-       case LOG_NOTICE:
-               log_level = G_LOG_LEVEL_MESSAGE;
-               break; 
-       case LOG_INFO:
-               log_level = G_LOG_LEVEL_INFO;
-               break; 
-       case LOG_DEBUG:
-               log_level = G_LOG_LEVEL_DEBUG;
-               if (!cfs.debug)
-                       return;
-               break; 
-       default:  
-               log_level = G_LOG_LEVEL_INFO;
-       }
-
-       cfs_log(G_LOG_DOMAIN, log_level, file, line, "", msg);
-}
-
 // xml parser for cluster.conf - just good enough to extract version
 
 typedef struct