]> git.proxmox.com Git - pve-cluster.git/commitdiff
corretly enable/disable logs to stderr
authorDietmar Maurer <dietmar@proxmox.com>
Thu, 9 Feb 2012 11:05:05 +0000 (12:05 +0100)
committerDietmar Maurer <dietmar@proxmox.com>
Thu, 9 Feb 2012 11:05:05 +0000 (12:05 +0100)
Note: Angus told me to do it that way.

data/src/pmxcfs.c

index 546191c9453804676439d6807c931a90d14d21b3..8f35c9212262e82ca2f42d0898cd87d8923ab4b0 100644 (file)
@@ -563,16 +563,18 @@ read_debug_setting_cb(cfs_plug_t *plug)
 static void 
 update_qb_log_settings(void) 
 {
+       qb_log_filter_ctl(QB_LOG_STDERR, QB_LOG_FILTER_REMOVE, QB_LOG_FILTER_FILE, "*", LOG_DEBUG);
+
        if (cfs.debug) {
                qb_log_format_set(QB_LOG_SYSLOG, "[%g] %p: %b (%f:%l:%n)");
                qb_log_format_set(QB_LOG_STDERR, "[%g] %p: %b (%f:%l:%n)");
                qb_log_ctl(QB_LOG_SYSLOG, QB_LOG_CONF_PRIORITY_BUMP, LOG_INFO - LOG_DEBUG);
-               qb_log_ctl(QB_LOG_STDERR, QB_LOG_CONF_PRIORITY_BUMP, LOG_INFO - LOG_DEBUG);
+               qb_log_filter_ctl(QB_LOG_STDERR, QB_LOG_FILTER_ADD, QB_LOG_FILTER_FILE, "*", LOG_DEBUG);
        } else {
                qb_log_format_set(QB_LOG_SYSLOG, "[%g] %p: %b");
                qb_log_format_set(QB_LOG_STDERR, "[%g] %p: %b");
                qb_log_ctl(QB_LOG_SYSLOG, QB_LOG_CONF_PRIORITY_BUMP, LOG_DEBUG - LOG_INFO);
-               qb_log_ctl(QB_LOG_STDERR, QB_LOG_CONF_PRIORITY_BUMP, LOG_DEBUG - LOG_INFO);
+               qb_log_filter_ctl(QB_LOG_STDERR, QB_LOG_FILTER_ADD, QB_LOG_FILTER_FILE, "*", LOG_INFO);
        }
 }
 
@@ -703,8 +705,6 @@ int main(int argc, char *argv[])
        qb_log_tags_stringify_fn_set(log_tags_stringify);
 
        qb_log_ctl(QB_LOG_STDERR, QB_LOG_CONF_ENABLED, QB_TRUE);
-       qb_log_filter_ctl(QB_LOG_STDERR, QB_LOG_FILTER_ADD,
-                         QB_LOG_FILTER_FILE, "*", LOG_DEBUG);
 
        update_qb_log_settings();