From a6bd1095bf79e1f376f9b27abfbb2fd6ecdf03ea Mon Sep 17 00:00:00 2001
From: vjrj <vjrj@ourproject.org>
Date: Wed, 4 Apr 2018 08:42:02 +0200
Subject: [PATCH] Added master/worker pm2 detection and mail configuration

---
 imports/startup/server/email.js    |  5 ++++-
 imports/startup/server/index.js    |  1 +
 imports/startup/server/isMaster.js | 16 ++++++++++++++++
 package-lock.json                  |  5 +++++
 package.json                       |  1 +
 5 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 imports/startup/server/isMaster.js

diff --git a/imports/startup/server/email.js b/imports/startup/server/email.js
index 6171740..e9fa9b3 100644
--- a/imports/startup/server/email.js
+++ b/imports/startup/server/email.js
@@ -3,6 +3,7 @@ import { Mongo } from 'meteor/mongo';
 import nodemailer from 'nodemailer';
 import { MailTime } from 'meteor/ostrio:mailer';
 import i18n from 'i18next';
+import isMaster from './isMaster';
 
 const transports = [];
 
@@ -22,7 +23,8 @@ export const hr = `<table cellspacing="0" cellpadding="0" border="0" width="100%
 
 let MailQueue;
 
-if (Meteor.settings.private.isMailServer) {
+if (Meteor.settings.private.isMailServer && isMaster) {
+  console.log('I\'m the mail server');
   MailQueue = new MailTime({
     db,
     type: 'server',
@@ -47,6 +49,7 @@ if (Meteor.settings.private.isMailServer) {
     template: MailTime.Template // Use default template
   });
 } else {
+  console.log('I\'m a mail client');
   MailQueue = new MailTime({
     db,
     type: 'client',
diff --git a/imports/startup/server/index.js b/imports/startup/server/index.js
index 0fd20ce..0d50cb8 100644
--- a/imports/startup/server/index.js
+++ b/imports/startup/server/index.js
@@ -14,3 +14,4 @@ import './subsUnion';
 import './prerender';
 import './feedback';
 import './cron';
+import './isMaster';
diff --git a/imports/startup/server/isMaster.js b/imports/startup/server/isMaster.js
new file mode 100644
index 0000000..1bcdd32
--- /dev/null
+++ b/imports/startup/server/isMaster.js
@@ -0,0 +1,16 @@
+/* eslint-disable import/no-absolute-path */
+
+import pm2Master from 'pm2-master';
+import { Meteor } from 'meteor/meteor';
+
+Meteor.startup(() => {
+  if (pm2Master.isMaster()) {
+    console.log('This is the master process');
+  } else {
+    console.log('This is a worker process');
+  }
+});
+
+const isMaster = () => pm2Master.isMaster();
+
+export default isMaster;
diff --git a/package-lock.json b/package-lock.json
index a9f6fb1..d6c8d27 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9725,6 +9725,11 @@
       "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
       "dev": true
     },
+    "pm2-master": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/pm2-master/-/pm2-master-1.1.3.tgz",
+      "integrity": "sha512-/TBL6nG8Lv/ZZanbxHTAEba26AFHvZNhT/Ug6VSEnmRy+2nrL83r4X4t29FWFSkiXtOcgUMGb4cWpuz9CY9w1Q=="
+    },
     "popper.js": {
       "version": "1.12.9",
       "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.12.9.tgz",
diff --git a/package.json b/package.json
index da0b9cc..11e372d 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,7 @@
     "moment-timezone": "^0.5.14",
     "node-geocoder": "^3.21.1",
     "nodemailer": "^4.4.2",
+    "pm2-master": "^1.1.3",
     "popper.js": "^1.12.7",
     "prerender-node": "^2.7.4",
     "prop-types": "^15.6.0",