# HG changeset patch # User Eric Joseph-Alexandre # Date 1368859613 -7200 # Node ID 54fe9ba8edf099d97fc28b9fdda4e123d6963e9c # Parent 4fcff583928149150720d99f5846a4e1a3b11a5b pizza-bot: Remove lockfile on EXIT diff -r 4fcff5839281 -r 54fe9ba8edf0 pizza-bot --- a/pizza-bot Sat May 11 08:02:32 2013 +0100 +++ b/pizza-bot Sat May 18 08:46:53 2013 +0200 @@ -22,8 +22,9 @@ builds="$cache/builds" lockfile="/var/lock/pizza.lock" feeds="$pizza/xml" +logfile="/var/log/pizza.log" -trap 'rm -f $lockfile ; exit 1' TERM INT +trap 'rm -f $lockfile ; exit 1' TERM INT EXIT # Help usage() { @@ -37,7 +38,7 @@ if [ -f "$lockfile" ]; then ps | grep ^`cat $lockfile` \ && echo "Pizza is running." \ - || echo "Pizza is locked but not running!" + || echo "Pizza is locked but not running!" else echo "Pizza is not running." fi @@ -47,7 +48,7 @@ # Logger: Write log _logger() { - printf "%s pizza-bot: %s\n" `date '+%D %H'` $@ + echo "$(date '+%Y-%m-%d %T') - $@" >> $logfile } # Log activities, we want first letter capitalized.