Merge lp:~lynxman/ubuntu/oneiric/rabbitmq-server/lp_838959 into lp:ubuntu/oneiric/rabbitmq-server

[Marc Cluet]

  * Added explicit log line in startup_* and shutdown_* (LP: #838959)
    - Added a log line with a timestamp to indicate either the success or
      failure on startup/shutdown

[Jamie Strandboge (jdstrand)]

This looks fine to me, but you should use 'submittodebian' so they can incorporate it as well. Preparing the upload now.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-19 18:18:49 +0000
+++ debian/changelog	2011-09-14 16:00:28 +0000
@@ -1,3 +1,11 @@
+rabbitmq-server (2.5.0-1ubuntu2) oneiric; urgency=low
+
+  * Added explicit log line in startup_* and shutdown_* (LP: #838959)
+    - Added a log line with a timestamp to indicate either the success or
+      failure on startup/shutdown
+
+ -- Marc Cluet <[e-mail]>  Wed, 14 Sep 2011 17:56:32 +0200
+
 rabbitmq-server (2.5.0-1ubuntu1) oneiric; urgency=low
 
   * Merge from Debian Unstable. Remaining changes:

=== modified file 'debian/rabbitmq-server.init' (properties changed: -x to +x)
--- debian/rabbitmq-server.init	2011-06-16 09:55:40 +0000
+++ debian/rabbitmq-server.init	2011-09-14 16:00:28 +0000
@@ -51,9 +51,11 @@
                 if [ -n "$LOCK_FILE" ] ; then
                     touch $LOCK_FILE
                 fi
+                echo "`date` - rabbitmq successfully started" >> ${INIT_LOG_DIR}/startup_log
                 ;;
             *)
                 echo FAILED - check ${INIT_LOG_DIR}/startup_\{log, _err\}
+                echo "`date` - rabbitmq failed to start" >> ${INIT_LOG_DIR}/startup_err
                 RETVAL=1
                 ;;
         esac
@@ -71,8 +73,10 @@
             if [ -n "$LOCK_FILE" ] ; then
                 rm -f $LOCK_FILE
             fi
+            echo "`date` - rabbitmq successfully stopped" >> ${INIT_LOG_DIR}/shutdown_log
         else
             echo FAILED - check ${INIT_LOG_DIR}/shutdown_log, _err
+            echo "`date` - rabbitmq failed to stop" >> ${INIT_LOG_DIR}/shutdown_err
         fi
     else
         echo RabbitMQ is not running