changeset 10027:940d11bc5039 HEAD

master: Fixed reloading configuration.
author Timo Sirainen <tss@iki.fi>
date Fri, 09 Oct 2009 19:51:20 -0400
parents 4442b6aa5a66
children 6e109ea7b506
files src/master/main.c src/master/service-log.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/master/main.c	Fri Oct 09 19:05:47 2009 -0400
+++ b/src/master/main.c	Fri Oct 09 19:51:20 2009 -0400
@@ -353,6 +353,7 @@
 			 services->config->config_file_path);
 
 	/* switch to new configuration. */
+	services_monitor_stop(services);
 	(void)services_listen_using(new_services, services);
 	services_destroy(services);
 
--- a/src/master/service-log.c	Fri Oct 09 19:05:47 2009 -0400
+++ b/src/master/service-log.c	Fri Oct 09 19:51:20 2009 -0400
@@ -133,7 +133,8 @@
 			services[i]->log_process_internal_fd = -1;
 		}
 	}
-	service_process_notify_deinit(&service_list->log_byes);
+	if (service_list->log_byes != NULL)
+		service_process_notify_deinit(&service_list->log_byes);
 	if (service_list->master_log_fd[0] != -1) {
 		if (close(service_list->master_log_fd[0]) < 0)
 			i_error("close(master log fd) failed: %m");