From f8fd0932c84b1642a71f78ad72e87d1842a1d2ab Mon Sep 17 00:00:00 2001 From: Jeffrey Hutzelman Date: Thu, 7 Feb 2013 17:09:56 -0500 Subject: zhm: Don't send HM_BOOT on new_server if -N used If -N was used, then not only should the hostmanager not send an HM_BOOT to the first server it contacts; it should also not send one to other servers it tries when the first one fails to respond. However, it should consistently send HM_BOOT when coming back from a SIGHUP deactivation where it has previously sent HM_FLUSH (if you don't want that behavior, use -f and avoid sending SIGHUP to the hostmanager). This fixes #88 --- zhm/zhm_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'zhm/zhm_server.c') diff --git a/zhm/zhm_server.c b/zhm/zhm_server.c index 0209054..0cce960 100644 --- a/zhm/zhm_server.c +++ b/zhm/zhm_server.c @@ -283,7 +283,7 @@ new_server(char *sugg_serv) syslog (LOG_INFO, "Server went down, finding new server."); send_flush_notice(HM_DETACH); find_next_server(sugg_serv); - if (booting) { + if (booting || deactivated) { send_boot_notice(HM_BOOT); deactivated = 0; } else { -- cgit v1.2.3