]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
Split priority conversion from virLogOutputToSyslog
authorMiloslav Trmač <mitr@redhat.com>
Thu, 27 Sep 2012 11:34:04 +0000 (12:34 +0100)
committerDaniel P. Berrange <berrange@redhat.com>
Thu, 27 Sep 2012 11:46:21 +0000 (12:46 +0100)
Allow for the code converting from libvirt log levels to syslog
log levels to be reused.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
src/util/logging.c

index cdaf86ebfc24828b0e7a94421cc210e4d3aaa116..dc78e948d833ca4ff40b2b02ded36e9364bd09d5 100644 (file)
@@ -862,6 +862,22 @@ static int virLogAddOutputToFile(int priority, const char *file) {
 }
 
 #if HAVE_SYSLOG_H
+static int virLogPrioritySyslog(virLogPriority priority)
+{
+    switch (priority) {
+    case VIR_LOG_DEBUG:
+        return LOG_DEBUG;
+    case VIR_LOG_INFO:
+        return LOG_INFO;
+    case VIR_LOG_WARN:
+        return LOG_WARNING;
+    case VIR_LOG_ERROR:
+        return LOG_ERR;
+    default:
+        return LOG_ERR;
+    }
+}
+
 static void virLogOutputToSyslog(const char *category ATTRIBUTE_UNUSED,
                                  int priority,
                                  const char *funcname ATTRIBUTE_UNUSED,
@@ -871,27 +887,9 @@ static void virLogOutputToSyslog(const char *category ATTRIBUTE_UNUSED,
                                  const char *str,
                                  void *data ATTRIBUTE_UNUSED)
 {
-    int prio;
-
     virCheckFlags(VIR_LOG_STACK_TRACE,);
 
-    switch (priority) {
-        case VIR_LOG_DEBUG:
-            prio = LOG_DEBUG;
-            break;
-        case VIR_LOG_INFO:
-            prio = LOG_INFO;
-            break;
-        case VIR_LOG_WARN:
-            prio = LOG_WARNING;
-            break;
-        case VIR_LOG_ERROR:
-            prio = LOG_ERR;
-            break;
-        default:
-            prio = LOG_ERR;
-    }
-    syslog(prio, "%s", str);
+    syslog(virLogPrioritySyslog(priority), "%s", str);
 }
 
 static char *current_ident = NULL;