moonbridge

changeset 275:d4fdc4ed4d81

Avoid duplicate shutdown
author jbe
date Tue Jun 06 17:56:00 2017 +0200 (2017-06-06)
parents 42b85f65327c
children 99ebca235c95
files moonbridge.c
line diff
     1.1 --- a/moonbridge.c	Tue Jun 06 11:25:07 2017 +0200
     1.2 +++ b/moonbridge.c	Tue Jun 06 17:56:00 2017 +0200
     1.3 @@ -1154,6 +1154,7 @@
     1.4        moonbr_log(LOG_WARNING, "Error while sending SIGTERM to own process group: %s", strerror(errno));
     1.5      }
     1.6    }
     1.7 +  moonbr_cond_terminate = 0;  /* ignore SIGTERM received by killpg() */
     1.8  }
     1.9  
    1.10  
    1.11 @@ -1553,10 +1554,7 @@
    1.12        moonbr_log(LOG_WARNING, "Fast shutdown requested");
    1.13        moonbr_terminate(MOONBR_EXITCODE_GRACEFUL);
    1.14      }
    1.15 -    if (moonbr_cond_terminate) {
    1.16 -      moonbr_initiate_shutdown();
    1.17 -      moonbr_cond_terminate = 0;
    1.18 -    }
    1.19 +    if (moonbr_cond_terminate) moonbr_initiate_shutdown();
    1.20      moonbr_cond_child = 0;  /* must not be reset between moonbr_try_destroy_worker() and poll() */
    1.21      moonbr_now(&now);
    1.22      for (pool=moonbr_first_pool; pool; pool=pool->next_pool) {

Impressum / About Us