From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Fri, 10 Nov 2017 11:09:29 +0000 (+0100)
Subject: daemon: terminate_server reduce code reuse
X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=commitdiff_plain;h=e6d1f1e2e58ff6ace616ba2a31d1e84b2bdb3b63

daemon: terminate_server reduce code reuse

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---

diff --git a/src/PVE/Daemon.pm b/src/PVE/Daemon.pm
index 55a03fc..d7f9a27 100644
--- a/src/PVE/Daemon.pm
+++ b/src/PVE/Daemon.pm
@@ -192,15 +192,10 @@ my $terminate_server = sub {
 
     $self->{terminate} = 1; # set flag to avoid worker restart
 
-    if (!$self->{max_workers}) {
-	eval { $self->shutdown(); };
-	warn $@ if $@;
-	return;
-    }
-
     eval { $self->shutdown(); };
     warn $@ if $@;
 
+    return if !$self->{max_workers}; # if we have no workers we're done here
 
     # if configured, leave children running on HUP
     return if $allow_open_children && $self->{leave_children_open_on_reload};