diff options
| author | Costa Tsaousis (ktsaou) <costa@tsaousis.gr> | 2018-09-11 17:49:03 +0300 |
|---|---|---|
| committer | Costa Tsaousis (ktsaou) <costa@tsaousis.gr> | 2018-09-11 17:49:03 +0300 |
| commit | f69a67d04099aecbfb5126e4ab8689db0ca18047 (patch) | |
| tree | 182c885926dcba60a2fcc88efd65c7b84b63b244 /system | |
| parent | 249055928195bc5a6c3916df6a9640e26b0814cc (diff) | |
use pidfile to send HUP to netdata via logrotate; fixes #4103; fixes #4020
Diffstat (limited to 'system')
| -rw-r--r-- | system/netdata-openrc.in | 4 | ||||
| -rw-r--r-- | system/netdata.logrotate.in | 2 | ||||
| -rw-r--r-- | system/netdata.service.in | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/system/netdata-openrc.in b/system/netdata-openrc.in index ad7adff1f6..dffd4c3d1c 100644 --- a/system/netdata-openrc.in +++ b/system/netdata-openrc.in @@ -20,7 +20,7 @@ : "${NETDATA_START_AFTER_SERVICES:=apache2 squid nginx mysql named opensips upsd hostapd postfix lm_sensors}" extra_started_commands="reload rotate save" -pidfile="/run/netdata/netdata.pid" +pidfile="@localstatedir_POST@/run/netdata/netdata.pid" command="@sbindir_POST@/netdata" command_args="-P ${pidfile} ${NETDATA_EXTRA_ARGS}" start_stop_daemon_args="-u ${NETDATA_OWNER}" @@ -36,7 +36,7 @@ depend() { need net after ${NETDATA_START_AFTER_SERVICES} - checkpath -o ${NETDATA_OWNER} -d @localstatedir_POST@/cache/netdata /run/netdata + checkpath -o ${NETDATA_OWNER} -d @localstatedir_POST@/cache/netdata @localstatedir_POST@/run/netdata } reload() { diff --git a/system/netdata.logrotate.in b/system/netdata.logrotate.in index ae1ac50a75..e7c44c3407 100644 --- a/system/netdata.logrotate.in +++ b/system/netdata.logrotate.in @@ -7,6 +7,6 @@ notifempty sharedscripts postrotate - /bin/kill -HUP `pidof netdata 2>/dev/null` 2>/dev/null || true + /bin/kill -HUP `cat @localstatedir_POST@/run/netdata.pid 2>/dev/null` 2>/dev/null || true endscript } diff --git a/system/netdata.service.in b/system/netdata.service.in index 972ec4f8ed..7b716b3b25 100644 --- a/system/netdata.service.in +++ b/system/netdata.service.in @@ -9,7 +9,7 @@ User=netdata Group=netdata RuntimeDirectory=netdata RuntimeDirectoryMode=0775 -ExecStart=@sbindir_POST@/netdata -P /run/netdata/netdata.pid -D -W set global 'process scheduling policy' 'keep' -W set global 'OOM score' 'keep' +ExecStart=@sbindir_POST@/netdata -P @localstatedir_POST@/run/netdata/netdata.pid -D -W set global 'process scheduling policy' 'keep' -W set global 'OOM score' 'keep' ExecStartPre=/bin/mkdir -p @localstatedir_POST@/cache/netdata ExecStartPre=/bin/chown -R netdata:netdata @localstatedir_POST@/cache/netdata PermissionsStartOnly=true |