Skip to content
Snippets Groups Projects
Commit 23f2b475 authored by Cameron Sparr's avatar Cameron Sparr
Browse files

Ignore errors in systemd

closes #1022
parent 194288c0
No related branches found
No related tags found
No related merge requests found
...@@ -50,6 +50,7 @@ based on _prefix_ in addition to globs. This means that a filter like ...@@ -50,6 +50,7 @@ based on _prefix_ in addition to globs. This means that a filter like
- [#1024](https://github.com/influxdata/telegraf/issues/1024): Don't replace `.` with `_` in datadog output. - [#1024](https://github.com/influxdata/telegraf/issues/1024): Don't replace `.` with `_` in datadog output.
- [#1058](https://github.com/influxdata/telegraf/issues/1058): Fix possible leaky TCP connections in influxdb output. - [#1058](https://github.com/influxdata/telegraf/issues/1058): Fix possible leaky TCP connections in influxdb output.
- [#1044](https://github.com/influxdata/telegraf/pull/1044): Fix SNMP OID possible collisions. Thanks @relip - [#1044](https://github.com/influxdata/telegraf/pull/1044): Fix SNMP OID possible collisions. Thanks @relip
- [#1022](https://github.com/influxdata/telegraf/issues/1022): Dont error deb/rpm install on systemd errors.
## v0.12.1 [2016-04-14] ## v0.12.1 [2016-04-14]
......
...@@ -12,7 +12,7 @@ function install_init { ...@@ -12,7 +12,7 @@ function install_init {
function install_systemd { function install_systemd {
cp -f $SCRIPT_DIR/telegraf.service /lib/systemd/system/telegraf.service cp -f $SCRIPT_DIR/telegraf.service /lib/systemd/system/telegraf.service
systemctl enable telegraf systemctl enable telegraf || true
systemctl daemon-reload || true systemctl daemon-reload || true
} }
...@@ -53,29 +53,29 @@ if [[ -f /etc/redhat-release ]]; then ...@@ -53,29 +53,29 @@ if [[ -f /etc/redhat-release ]]; then
# RHEL-variant logic # RHEL-variant logic
which systemctl &>/dev/null which systemctl &>/dev/null
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
install_systemd install_systemd
else else
# Assuming sysv # Assuming sysv
install_init install_init
install_chkconfig install_chkconfig
fi fi
elif [[ -f /etc/debian_version ]]; then elif [[ -f /etc/debian_version ]]; then
# Debian/Ubuntu logic # Debian/Ubuntu logic
which systemctl &>/dev/null which systemctl &>/dev/null
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
install_systemd install_systemd
systemctl restart telegraf systemctl restart telegraf || echo "WARNING: systemd not running."
else else
# Assuming sysv # Assuming sysv
install_init install_init
install_update_rcd install_update_rcd
invoke-rc.d telegraf restart invoke-rc.d telegraf restart
fi fi
elif [[ -f /etc/os-release ]]; then elif [[ -f /etc/os-release ]]; then
source /etc/os-release source /etc/os-release
if [[ $ID = "amzn" ]]; then if [[ $ID = "amzn" ]]; then
# Amazon Linux logic # Amazon Linux logic
install_init install_init
install_chkconfig install_chkconfig
fi fi
fi fi
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment