daemon: add missing parenthesis around list

[pve-common.git] / src / PVE / Daemon.pm

diff --git a/src/PVE/Daemon.pm b/src/PVE/Daemon.pm
index 55a03fca3eacbdc9d18c34de4fac50b366a0f8d6..ee3c67c4d4895fb6bcbae008946f7228263a619f 100644 (file)
--- 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};
@@ -495,7 +490,7 @@ sub restart_daemon {
     }
 
     if ($self->{max_workers}) {
-       my @workers = keys %{$self->{workers}}, keys %{$self->{old_workers}};
+       my @workers = (keys %{$self->{workers}}, keys %{$self->{old_workers}});
        $ENV{PVE_DAEMON_WORKER_PIDS} = join(':', @workers);
     }