Explorar o código

fix logging reload operation and clean up main init

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1740 fd59a12c-fef9-0310-b244-a6a79926bd2f
Fabio M. Di Nitto %!s(int64=17) %!d(string=hai) anos
pai
achega
e8ffb05b2f
Modificáronse 2 ficheiros con 6 adicións e 6 borrados
  1. 0 6
      exec/main.c
  2. 6 0
      exec/mainconfig.c

+ 0 - 6
exec/main.c

@@ -639,12 +639,6 @@ int main (int argc, char **argv)
 		corosync_exit_error (AIS_DONE_MAINCONFIGREAD);
 		corosync_exit_error (AIS_DONE_MAINCONFIGREAD);
 	}
 	}
 
 
-	logsys_config_facility_set ("corosync", main_config.syslog_facility);
-	logsys_config_mode_set (main_config.logmode);
-	logsys_config_file_set (&error_string, main_config.logfile);
-
-	logsys_fork_completed ();
-
 	aisexec_uid_determine (&main_config);
 	aisexec_uid_determine (&main_config);
 
 
 	aisexec_gid_determine (&main_config);
 	aisexec_gid_determine (&main_config);

+ 6 - 0
exec/mainconfig.c

@@ -197,6 +197,10 @@ int corosync_main_config_read_logging (
 			}
 			}
 		}
 		}
 
 
+		logsys_config_facility_set ("corosync", main_config->syslog_facility);
+		logsys_config_mode_set (main_config->logmode);
+		logsys_config_file_set (error_string, main_config->logfile);
+
 		objdb->object_find_create (
 		objdb->object_find_create (
 			object_service_handle,
 			object_service_handle,
 			"logger_subsys",
 			"logger_subsys",
@@ -327,6 +331,8 @@ int corosync_main_config_read (
 
 
 	add_logsys_config_notification(objdb, main_config);
 	add_logsys_config_notification(objdb, main_config);
 
 
+	logsys_fork_completed ();
+
 	return 0;
 	return 0;
 
 
 parse_error:
 parse_error: