proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-07-26 03:10:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PVE:Daemon start/restart with systemd

Browse Source 
Added some lines which make it possible to stop/start/restart daemon services with pve scripts,
avoiding the problem of systemd not recognizing the new status of the (re)started service processes.

The scripts now rely on systemctl.

Signed-off-by: Alen Grizonic <a.grizonic@proxmox.com>
This commit is contained in:
Alen Grizonic 2015-06-18 19:00:12 +02:00 committed by Dietmar Maurer
parent 2c4ec58c52
commit a526ab1cfc
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/PVE/Daemon.pm
View File

@ -578,6 +578,16 @@ my $read_pid = sub {
return $pid; return $pid;
}; };
# checks if the process was started by systemd
my $init_ppid = sub {
if (getppid() == 1) {
return 1;
} else {
return 0;
}
};
sub running { sub running {
my ($self) = @_; my ($self) = @_;
@ -654,7 +664,11 @@ sub register_start_command {
code => sub { code => sub {
my ($param) = @_; my ($param) = @_;
$self->start($param->{debug}); if (&$init_ppid()) {
$self->start($param->{debug});
} else {
PVE::Tools::run_command(['systemctl', 'start', $self->{name}]);
}
return undef; return undef;
}}); }});
@ -700,7 +714,11 @@ sub register_restart_command {
code => sub { code => sub {
my ($param) = @_; my ($param) = @_;
&$reload_daemon($self, $use_hup); if (&$init_ppid()) {
&$reload_daemon($self, $use_hup);
} else {
PVE::Tools::run_command(['systemctl', $use_hup ? 'reload-or-restart' : 'restart', $self->{name}]);
}
return undef; return undef;
}}); }});
@ -750,7 +768,11 @@ sub register_stop_command {
code => sub { code => sub {
my ($param) = @_; my ($param) = @_;
$self->stop(); if (&$init_ppid()) {
$self->stop();
} else {
PVE::Tools::run_command(['systemctl', 'stop', $self->{name}]);
}
return undef; return undef;
}}); }});