process start fix

Author: Steveorevo

mailcatcher.php

@@ -71,10 +71,9 @@ public function setup( $user, $domain ) {
             }
 
             // Start mailcatcher if not started
-            if ( !is_dir('/home/mailcatcher/.pm2') ) {
-                $cmd = 'runuser -l mailcatcher -c "cd /opt/mailcatcher && source /opt/nvm/nvm.sh ; pm2 start mailcatcher.config.js"';
-                shell_exec( $cmd );
-            }
+            $cmd = 'if ! runuser -l "mailcatcher" -c "cd /opt/mailcatcher && source /opt/nvm/nvm.sh && pm2 list" | grep -q "mailcatcher_app"; ';
+            $cmd .= 'then runuser -l "mailcatcher" -c "cd /opt/mailcatcher && source /opt/nvm/nvm.sh ; pm2 start mailcatcher.config.js"; fi';
+            shell_exec( $cmd );
         }
 
         public function priv_unsuspend_domain( $args ) {

src/mailcatcher.config.js

@@ -3,13 +3,10 @@ module.exports = {
 
         // Obtain mailcatcher details
         const fs = require('fs');
-        const {execSync} = require('child_process');
-        let hostname = execSync('/bin/bash -c "hostname -f"').toString().trim();
-        hostname = hostname.split('.').slice(-2).join('.');
         let details = {};
         details.cwd = '/opt/mailcatcher';
         details._app = 'mailcatcher';
-        details.name = details._app + '-' + hostname;
+        details.name = details._app + '_app';
         details.script = details.cwd + '/' + details._app + '.js';
         details.watch = ['.restart'];
         details.ignore_watch = [];
@@ -22,6 +19,7 @@ module.exports = {
         if (fs.existsSync(nvmrc)) {
             ver = fs.readFileSync(nvmrc, {encoding: 'utf8', flat: 'r'}).trim();
         }
+        const {execSync} = require('child_process');
         ver = execSync('/bin/bash -c "source /opt/nvm/nvm.sh && nvm which ' + ver + '"').toString().trim();
         if (!fs.existsSync(ver)) {
             console.error(ver);