Merge branch 'shared-data-model' of...

Merge branch 'shared-data-model' of https://gitlab.coko.foundation/xpub/xpub-epmc.git into shared-data-model

Dockerfile

@@ -25,6 +25,9 @@ ENV NODE_ENV "development"
 
 RUN npm install -g node-pre-gyp
 
+# Install pm2
+RUN [ "yarn", "global", "add", "pm2" ]
+
 # We do a development install because react-styleguidist is a dev dependency and we want to run tests
 RUN [ "yarn", "install" ]
 

crontab

@@ -18,10 +18,10 @@
 */30 * * * * node server/ncbi-integration/publishedCheck
 
 # check the ftp bulk upload monitor is running
-*/30 * * * * ./runShellScript.sh "node server/ftp-integration/api"
+# */30 * * * * ./runShellScript.sh "node server/ftp-integration/api"
 
 # check the ftp taggers upload monitor is running
-*/30 * * * * ./runShellScript.sh "node server/ftp-integration/taggedXML"
+# */30 * * * * ./runShellScript.sh "node server/ftp-integration/taggedXML"
 
 
 # always leave an empty line at the end of the file

pm2.config.js

+const pm2Config = {
+  apps: [
+    {
+      name: 'pubsweet',
+      script: './node_modules/pubsweet/src/startup/start.js',
+      exec_mode: 'cluster_mode',
+      instances: 1,
+    },
+    {
+      name: 'ftpBulkMonitor',
+      script: './server/ftp-integration/api.js',
+      instances: 1,
+    },
+    {
+      name: 'ftpTaggerMonitor',
+      script: './server/ftp-integration/taggedXML.js',
+      instances: 1,
+    },
+  ],
+}
+
+module.exports = pm2Config

post_init.sh

@@ -5,12 +5,6 @@ echo "Running cron service"
 env | cat - /etc/cron.d/crontab > temp && crontab temp
 service cron start
 
-echo "Running ftp bulk upload monitor"
-./runShellScript.sh "node server/ftp-integration/api" &
-
-echo "Running ftp taggers upload monitor"
-./runShellScript.sh "node server/ftp-integration/taggedXML" &
-
 echo "Running Seed"
 yarn seed
 

wrapperScript.sh

 #!/bin/bash
 
 echo "Running server in the background"
-cmd="npx pubsweet server"
+cmd="pm2 start pm2.config.js"
 
 $cmd &