Ottomata has submitted this change and it was merged. Change subject: Remove kafkatee.service's ExecStopPost ......................................................................
Remove kafkatee.service's ExecStopPost ExecStopPost is not passed to a shell, so test -f && rm is currently producing errors. We could write this as rm -f, but on the other hand, looking at ezd.c, kafkatee seems to perfectly handle fine the case where a pidfile already exists and only aborts if there is an active lock on the file, so no reason to do this magic at all. Remove it altogether. Change-Id: Idc05ca6ad3ee8d6da6d703812dc083badec800c6 --- M debian/changelog M debian/kafkatee.service 2 files changed, 10 insertions(+), 10 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 8cf783f..b9cc152 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +kafkatee (0.1.3-3) unstable; urgency=low + + * Remove kafkatee.service's syntactically incorrect and redundant + ExecStopPost. + + -- Faidon Liambotis <fai...@wikimedia.org> Fri, 19 Jun 2015 17:25:42 +0300 + kafkatee (0.1.3-2) unstable; urgency=low * Fix for kafkatee.postinst in Jessie - use service command for restarting rsyslog. diff --git a/debian/kafkatee.service b/debian/kafkatee.service index 636abd5..2003222 100644 --- a/debian/kafkatee.service +++ b/debian/kafkatee.service @@ -1,20 +1,13 @@ [Unit] -Description=kafkatee - Apache Kafka consumer with multiple inputs and outputs -After=network.target local-fs.target +Description=kafkatee +After=local-fs.target +After=network.target [Service] Type=simple User=kafkatee - ExecStart=/usr/bin/kafkatee -D -c /etc/kafkatee.conf ExecReload=/bin/kill -HUP $MAINPID - -# If running with inactive piped inputs (unlikely) -# kafkatee may not clean up properly after itself. -# Manually remove the pid file so that kafkatee will -# start up properly next time. -ExecStopPost=/usr/bin/test -f /var/run/kafkatee/kafkatee.pid && /bin/rm /var/run/kafkatee/kafkatee.pid - Restart=on-failure [Install] -- To view, visit https://gerrit.wikimedia.org/r/219377 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idc05ca6ad3ee8d6da6d703812dc083badec800c6 Gerrit-PatchSet: 2 Gerrit-Project: analytics/kafkatee Gerrit-Branch: debian Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org> Gerrit-Reviewer: Ottomata <o...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
