[Monotone-commits-diffs] net.venge.monotone.contrib.usher: 701c964494a90ebcf3c969e31188f9f99e7c0aae

[code]

revision:            701c964494a90ebcf3c969e31188f9f99e7c0aae
date:                2011-04-29T11:07:33
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.contrib.usher
changelog:
* utils/usherctl.in (USHER_LOGFILE): Added variable for a main logfile
  for usher.  This is only used with user-level startups.

manifest:
format_version "1"

new_manifest [00102d68d4f68f9f480f3f41e1dcc98949978911]

old_revision [bb4676477a14e942d6e4952cdc7a94ce8e28a61c]

patch "utils/usherctl.in"
 from [880a672ad51f6f6ddb1ebbac18a38f1b2942ccee]
   to [359563a98fb7230867120be56308e262fe7b13cb]
============================================================
--- utils/usherctl.in	880a672ad51f6f6ddb1ebbac18a38f1b2942ccee
+++ utils/usherctl.in	359563a98fb7230867120be56308e262fe7b13cb
@@ -25,7 +25,9 @@ address@hidden@/mtn
 #			(default: $USHER_CONFDIR/skel)
 # USHER_PIDFILE		Usher PID file.
 #			(default: @localstatedir@/run/usher.pid)
-# USHER_LOGDIR		Usher log directory.
+# USHER_LOGFILE		Main usher log file.
+#			(default: @localstatedir@/log/usher.log)
+# USHER_LOGDIR		Usher log directory for monotone processes.
 #			(default: @localstatedir@/log/usher)
 # USHER_PROJECTDIR	Usher projects directory.
 #			(default: @localstatedir@/lib/usher/projects)
@@ -91,6 +93,7 @@ USHER_PIDFILE=${USHER_PIDFILE:address@hidden
 USHER_CONFD=${USHER_CONFD:-"$USHER_CONFDIR/conf.d"}
 USHER_SKEL=${USHER_SKEL:-"$USHER_CONFDIR/skel"}
 USHER_PIDFILE=${USHER_PIDFILE:address@hidden@/run/usher.pid}
+USHER_LOGFILE=${USHER_LOGFILE:address@hidden@/log/usher.log}
 USHER_LOGDIR=${USHER_LOGDIR:address@hidden@/log/usher}
 USHER_PROJECTDIR=${USHER_PROJECTDIR:address@hidden@/lib/usher/projects}
 
@@ -170,7 +173,7 @@ start () {
 	fi
 	rm -f "$USHER_PIDFILE"
 	$USHER -p "$USHER_PIDFILE" "$USHER_CONF" \
-	    < /dev/null > /dev/null 2> /dev/null &
+	    < /dev/null >> "$USHER_LOGFILE" 2>&1 &
     else
 	$sysinit start
     fi