Updated version 1.8.0+dfsg from 'upstream/1.8.0+dfsg'

with Debian dir 412de09d9bca38fe00146ef090f9e53f76493882

3 files changed, 30 insertions, 4 deletions

diff --git a/system/netdata-init-d.in b/system/netdata-init-d.in
index 468ceee2..90a4b95b 100644
--- a/system/netdata-init-d.in
+++ b/system/netdata-init-d.in
@@ -15,7 +15,7 @@ DAEMON="netdata"
 DAEMON_PATH=@sbindir_POST@
 PIDFILE=@localstatedir_POST@/run/$DAEMON.pid
 DAEMONOPTS="-P $PIDFILE"
-STOP_TIMEOUT="10"
+STOP_TIMEOUT="60"
 
 [ -e /etc/sysconfig/$DAEMON ] && . /etc/sysconfig/$DAEMON
 
diff --git a/system/netdata-openrc.in b/system/netdata-openrc.in
index 55808364..465e1232 100644
--- a/system/netdata-openrc.in
+++ b/system/netdata-openrc.in
@@ -10,7 +10,7 @@
 
 # The timeout in seconds to wait for netdata
 # to save its database on disk and exit.
-: ${NETDATA_WAIT_EXIT_TIMEOUT:=15}
+: ${NETDATA_WAIT_EXIT_TIMEOUT:=60}
 
 # When set to 1, if netdata does not exit in
 # NETDATA_WAIT_EXIT_TIMEOUT, we will force it
diff --git a/system/netdata.service.in b/system/netdata.service.in
index 6bbb84eb..1d4af988 100644
--- a/system/netdata.service.in
+++ b/system/netdata.service.in
@@ -1,15 +1,41 @@
 [Unit]
 Description=Real time performance monitoring
-After=network.target httpd.service squid.service nfs-server.service mysqld.service mysql.service named.service postfix.service
+After=network.target httpd.service squid.service nfs-server.service mysqld.service mysql.service named.service postfix.service chronyd.service
 
 [Service]
 Type=simple
 User=netdata
 Group=netdata
-ExecStart=@sbindir_POST@/netdata -D
+RuntimeDirectory=netdata
+RuntimeDirectoryMode=0775
+ExecStart=@sbindir_POST@/netdata -P /run/netdata/netdata.pid -D
 
 # saving a big db on slow disks may need some time
 TimeoutStopSec=60
 
+# restart netdata if it crashes
+Restart=on-failure
+RestartSec=30
+
+# The minimum netdata Out-Of-Memory (OOM) score.
+# netdata (via [global].OOM score in netdata.conf) can only increase the value set here.
+# To decrease it, set the minimum here and set the same or a higher value in netdata.conf.
+# Valid values: -1000 (never kill netdata) to 1000 (always kill netdata).
+#OOMScoreAdjust=0
+
+# By default netdata switches to scheduling policy idle, which makes it use CPU, only
+# when there is spare available.
+# Valid policies: other (the system default) | batch | idle | fifo | rr
+#CPUSchedulingPolicy=other
+
+# This sets the maximum scheduling priority netdata can set (for policies: rr and fifo).
+# netdata (via [global].process scheduling priority in netdata.conf) can only lower this value.
+# Priority gets values 1 (lowest) to 99 (highest).
+#CPUSchedulingPriority=1
+
+# For scheduling policy 'other' and 'batch', this sets the lowest niceness of netdata.
+# netdata (via [global].process nice level in netdata.conf) can only increase the value set here.
+#Nice=0
+
 [Install]
 WantedBy=multi-user.target