master: Fixed reloading configuration.

--HG--
branch : HEAD

diff --git a/src/master/main.c b/src/master/main.c
index 45d170578464ee4fab5a31c56292f4a613d26474..8064dcabd22dafdeebd632ab6c313b8570ac42a5 100644 (file)
--- a/src/master/main.c
+++ b/src/master/main.c
@@ -353,6 +353,7 @@ sig_settings_reload(const siginfo_t *si ATTR_UNUSED,
                         services->config->config_file_path);
 
        /* switch to new configuration. */
+       services_monitor_stop(services);
        (void)services_listen_using(new_services, services);
        services_destroy(services);
 

diff --git a/src/master/service-log.c b/src/master/service-log.c
index b7a8294a650236a4ca9c61cd00b6dfe0d99c7434..3742179d73d7b5c4e5d7ea9c6410ed5cde07d3e5 100644 (file)
--- a/src/master/service-log.c
+++ b/src/master/service-log.c
@@ -133,7 +133,8 @@ void services_log_deinit(struct service_list *service_list)
                        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");