#3278 #3345: --silent -s and -v will not print banner anymore

Author: Unitech

bin/pm2

@@ -15,6 +15,13 @@ var PM2       = require('../lib/API.js');
 var pkg       = require('../package.json');
 var tabtab    = require('../lib/completion.js');
 
+// Early detection of silent to avoid printing motd
+if (process.argv.indexOf('--silent') > -1 ||
+    process.argv.indexOf('-s') > -1 ||
+    process.argv.indexOf('-v') > -1) {
+  process.env.PM2_DISCRETE_MODE = true;
+}
+
 var pm2 = new PM2();
 
 commander.version(pkg.version)
@@ -112,12 +119,6 @@ if (process.argv.indexOf('-s') > -1) {
   }
 }
 
-// Override -v behavior (do not spawn daemon)
-if (process.argv.indexOf('-v') > -1) {
-  console.log(pkg.version);
-  return process.exit(0);
-}
-
 function beginCommandProcessing() {
   pm2.getVersion(function(err, remote_version) {
     if (!err && (pkg.version != remote_version)) {

lib/Client.js

@@ -104,7 +104,10 @@ Client.prototype.start = function(cb) {
         Common.printError(err);
         return cb ? cb(err) : process.exit(that.conf.ERROR_EXIT);
       }
-      Common.printOut(that.conf.PREFIX_MSG + 'PM2 Successfully daemonized');
+
+      if (!process.env.PM2_DISCRETE_MODE)
+        Common.printOut(that.conf.PREFIX_MSG + 'PM2 Successfully daemonized');
+
       that.launchRPC(function(err, meta) {
         return cb(null, {
           daemon_mode      : that.conf.daemon_mode,
@@ -155,6 +158,14 @@ Client.prototype.initFileStructure = function (opts) {
     }
   }
 
+  if (process.env.PM2_DISCRETE_MODE) {
+    try {
+      fs.writeFileSync(path.join(opts.PM2_HOME, 'touch'), Date.now());
+    } catch(e) {
+      debug(e.stack || e);
+    }
+  }
+
   if (!process.env.PM2_PROGRAMMATIC && !fs.existsSync(path.join(opts.PM2_HOME, 'touch'))) {
     var dt = fs.readFileSync(path.join(__dirname, opts.KEYMETRICS_BANNER));
     console.log(dt.toString());
@@ -224,7 +235,8 @@ Client.prototype.launchDaemon = function(opts, cb) {
     node_args = node_args.concat(process.env.PM2_NODE_OPTIONS.split(' '));
   node_args.push(ClientJS);
 
-  Common.printOut(that.conf.PREFIX_MSG + 'Spawning PM2 daemon with pm2_home=' + this.pm2_home);
+  if (!process.env.PM2_DISCRETE_MODE)
+    Common.printOut(that.conf.PREFIX_MSG + 'Spawning PM2 daemon with pm2_home=' + this.pm2_home);
 
   var interpreter = 'node';
 

lib/binaries/DevCLI.js

@@ -2,6 +2,8 @@
 'use strict';
 
 process.env.PM2_NO_INTERACTION = 'true';
+// Do not print banner
+process.env.PM2_DISCRETE_MODE = true;
 
 var commander = require('commander');
 

lib/binaries/Runtime.js

@@ -12,6 +12,9 @@ var path      = require('path');
 
 var pm2;
 
+// Do not print banner
+process.env.PM2_DISCRETE_MODE = true;
+
 commander.version(pkg.version)
   .description('pm2-runtime is an automatic pmx injection that runs in simulated no-daemon environment')
   .option('--auto-manage', 'keep application online after command exit')

lib/binaries/Runtime4Docker.js

@@ -12,6 +12,9 @@ var pkg       = require('../../package.json');
 var path      = require('path');
 var pm2;
 
+// Do not print banner
+process.env.PM2_DISCRETE_MODE = true;
+
 commander.version(pkg.version)
   .description('pm2-docker is a drop-in replacement node.js binary with some interesting production features')
   .option('-i --instances <number>', 'launch [number] of processes automatically load-balanced. Increase overall performances and performance stability.')