diff options
Diffstat (limited to 'server-tools/instance-manager/manager.cc')
-rw-r--r-- | server-tools/instance-manager/manager.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/server-tools/instance-manager/manager.cc b/server-tools/instance-manager/manager.cc index e3daca71898..09d30e1312f 100644 --- a/server-tools/instance-manager/manager.cc +++ b/server-tools/instance-manager/manager.cc @@ -238,20 +238,20 @@ void manager(const Options &options) process_alarm(signo); else #endif + { + if (!guardian_thread.is_stopped()) + { + bool stop_instances= true; + guardian_thread.request_shutdown(stop_instances); + pthread_cond_signal(&guardian_thread.COND_guardian); + } + else { - if (!guardian_thread.is_stopped()) - { - bool stop_instances= true; - guardian_thread.request_shutdown(stop_instances); - pthread_cond_signal(&guardian_thread.COND_guardian); - } - else - { - thread_registry.deliver_shutdown(); - shutdown_complete= TRUE; - } + thread_registry.deliver_shutdown(); + shutdown_complete= TRUE; } } + } err: /* delete the pid file */ |