@cryptotaxi247 / netdata-1 / commits / f69a67d04

use pidfile to send HUP to netdata via logrotate; fixes #4103; fixes #4020

Costa Tsaousis (ktsaou) committed Sep 11, 2018 at 17:49 UTC f69a67d04099aecbfb5126e4ab8689db0ca18047
3 files changed +4 -4
system/netdata-openrc.in
+2 -2
@@ -20,7 +20,7 @@
20 : "${NETDATA_START_AFTER_SERVICES:=apache2 squid nginx mysql named opensips upsd hostapd postfix lm_sensors}"
21
22 extra_started_commands="reload rotate save"
23 -pidfile="/run/netdata/netdata.pid"
23 +pidfile="@localstatedir_POST@/run/netdata/netdata.pid"
24 command="@sbindir_POST@/netdata"
25 command_args="-P ${pidfile} ${NETDATA_EXTRA_ARGS}"
26 start_stop_daemon_args="-u ${NETDATA_OWNER}"
@@ -36,7 +36,7 @@ depend() {
36 need net
37 after ${NETDATA_START_AFTER_SERVICES}
38
39 - checkpath -o ${NETDATA_OWNER} -d @localstatedir_POST@/cache/netdata /run/netdata
39 + checkpath -o ${NETDATA_OWNER} -d @localstatedir_POST@/cache/netdata @localstatedir_POST@/run/netdata
40 }
41
42 reload() {
system/netdata.logrotate.in
+1 -1
@@ -7,6 +7,6 @@
7 notifempty
8 sharedscripts
9 postrotate
10 - /bin/kill -HUP `pidof netdata 2>/dev/null` 2>/dev/null || true
10 + /bin/kill -HUP `cat @localstatedir_POST@/run/netdata.pid 2>/dev/null` 2>/dev/null || true
11 endscript
12 }
system/netdata.service.in
+1 -1
@@ -9,7 +9,7 @@ User=netdata
9 Group=netdata
10 RuntimeDirectory=netdata
11 RuntimeDirectoryMode=0775
12 -ExecStart=@sbindir_POST@/netdata -P /run/netdata/netdata.pid -D -W set global 'process scheduling policy' 'keep' -W set global 'OOM score' 'keep'
12 +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'
13 ExecStartPre=/bin/mkdir -p @localstatedir_POST@/cache/netdata
14 ExecStartPre=/bin/chown -R netdata:netdata @localstatedir_POST@/cache/netdata
15 PermissionsStartOnly=true