Merge pull request #31 from nodejitsu/consistent-logs

[minor] More consistent logging in `restart` and `stop`.
nodejitsu · Sep 3, 2013 · c3c6b56 · c3c6b56
2 parents be1ec2c + 127500e
commit c3c6b56
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/bin/solenoid b/bin/solenoid
@@ -65,12 +65,9 @@ if (action === 'start') {
     version: argv['app-version'],
     env: argv['app-env']
   };
-  logger.info('Starting application...');
-}
-else {
-  logger.info('Stopping application...');
 }
 
+logger.info('Running ' + action + ' for app.');
 solenoid[action](options, function (err) {
   if (err) {
     logger.error('Error: ' + err.message);

diff --git a/lib/solenoid.js b/lib/solenoid.js
@@ -35,6 +35,8 @@ exports.start = function (options, callback) {
 };
 
 exports.restart = function (options, callback) {
+  var logger = options.logger;
+
   fs.exists(options.pidFile, function (exists) {
     if (!exists) {
       return callback(new Error(options.pidFile + ' does not exist.'));
@@ -46,9 +48,10 @@ exports.restart = function (options, callback) {
       }
 
       content = parseInt(content, 10);
+      logger.info('Sending SIGUSR1 - ' + content);
       if (!Number.isNaN(content)) {
         try { process.kill(content, 'SIGUSR1') }
-        catch (ex) { }
+        catch (ex) { logger.info('SIGUSR1 Error - ' + ex.message) }
       }
 
       callback();
@@ -71,6 +74,7 @@ exports.stop = function (options, callback) {
       return clean(options, callback);
     }
 
+    logger.info('Sending terminate signal - ' + content);
     killer({
       pid: content,
       timeout: 10000,
@@ -98,6 +102,7 @@ var clean = exports.clean = function clean(options, callback) {
 
   var logger = options.logger;
 
+  logger.info('Cleaning ' + options.runDir);
   async.forEachSeries(commands, function (args, next) {
     var command = args.shift(),
         child   = spawn(command, args);