Merge branch 'master' of github.com:ClusterLabs/pacemaker

ClusterLabs · Mar 8, 2013 · 7e42d77 · 7e42d77
2 parents bb044ce + 560dbc6
commit 7e42d77
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/mcp/corosync.c b/mcp/corosync.c
@@ -624,6 +624,7 @@ read_config(void)
     }
 
     set_daemon_option("logfacility", logging_syslog_facility);
+    setenv("HA_LOGFACILITY", logging_syslog_facility, 1);
 
     free(logging_debug);
     free(logging_logfile);

diff --git a/mcp/pacemaker.c b/mcp/pacemaker.c
@@ -809,7 +809,6 @@ main(int argc, char **argv)
     const char *facility = daemon_option("logfacility");
 
     setenv("LC_ALL", "C", 1);
-    setenv("HA_LOGFACILITY", facility, 1);
     setenv("HA_LOGD", "no", 1);
 
     set_daemon_option("mcp", "true");