Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion jobs/syslog_forwarder/templates/pre-start.erb
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,16 @@ chmod 0644 /etc/rsyslog.d/40-syslog-release-file-exclusion.conf

<% end %>

if command -v systemctl &>/dev/null; then
service_manager="$(cat /proc/1/comm 2>/dev/null)"
if [ -f "/var/vcap/bosh/agent.json" ] && command -v jq &>/dev/null; then
if jq 'paths(scalars) as $p | getpath($p) == "systemd"' /var/vcap/bosh/agent.json | grep -q true; then
service_manager="systemd"
else
service_manager="init"
fi
fi

if [ "${service_manager}" = "systemd" ] && command -v systemctl &>/dev/null; then
systemctl restart rsyslog
else
service rsyslog restart
Expand Down
13 changes: 11 additions & 2 deletions jobs/syslog_storer/templates/pre-start.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,17 @@ if [ -d "/etc/apparmor.d/rsyslog.d/" ]; then
fi
fi

if command -v systemctl &>/dev/null; then
service_manager="$(cat /proc/1/comm 2>/dev/null)"
if [ -f "/var/vcap/bosh/agent.json" ] && command -v jq &>/dev/null; then
if jq 'paths(scalars) as $p | getpath($p) == "systemd"' /var/vcap/bosh/agent.json | grep -q true; then
service_manager="systemd"
else
service_manager="init"
fi
fi

if [ "${service_manager}" = "systemd" ] && command -v systemctl &>/dev/null; then
systemctl restart rsyslog
else
service rsyslog restart
fi
fi