From df31a9ea9b9bc9188777398ea86569587640bec4 Mon Sep 17 00:00:00 2001
From: Paolo Arena <paolo.arena77@gmail.com>
Date: Wed, 13 Feb 2019 01:51:33 +0100
Subject: [PATCH] - Created Test Environment un Server test.freeplanet.app -
 mongodb open 2 connections port (3000 and 3001) - 27017 and 27018

---
 .gitignore                    |  3 +++
 ecosystem.config.js           | 13 +++++++++++--
 server/db/mongoose.js         |  3 ++-
 server/router/users_router.js |  2 +-
 server/server.js              |  5 ++---
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index b7971a6..aadbdd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 node_modules/
 .env.test
 .env.development
+.env.production
 ESEMPI/
 .idea
 package-lock.json
+deploynodejs_on_production.sh
+deploynodejs_on_test.sh
diff --git a/ecosystem.config.js b/ecosystem.config.js
index 808943d..3510bf1 100644
--- a/ecosystem.config.js
+++ b/ecosystem.config.js
@@ -9,10 +9,19 @@ module.exports = {
         "PORT": 3000,
         "NODE_ENV": "development"
       },
+      env_test: {
+        "PORT": 3001,
+        "NODE_ENV": "test",
+      },
       env_production: {
         "PORT": 3000,
         "NODE_ENV": "production",
-      }
+      },
+      log_file: "combined.outerr.log",
+      error_file: "err.log",
+      out_file: "out.log",
+      merge_logs: true,
+      log_date_format: "YYYY-MM-DD HH:mm:ss.SSSS Z"
     }
   ]
-}
+};
diff --git a/server/db/mongoose.js b/server/db/mongoose.js
index f22654d..241d404 100644
--- a/server/db/mongoose.js
+++ b/server/db/mongoose.js
@@ -4,6 +4,7 @@ mongoose.Promise = global.Promise;
 
 mongoose.level = "";
 
+
 mongoose.plugin(schema => {
   schema.options.usePushEach = true
 });
@@ -14,7 +15,7 @@ var options = {
   // user: process.env.UDB,
   // pass: process.env.PDB,
   useMongoClient: true,
-  useNewUrlParser: true,
+  // useNewUrlParser: true,  // non supportato
   promiseLibrary: require('bluebird')
 
   // useCreateIndex: true,
diff --git a/server/router/users_router.js b/server/router/users_router.js
index 5a148cb..da4c453 100644
--- a/server/router/users_router.js
+++ b/server/router/users_router.js
@@ -143,7 +143,7 @@ router.post('/login', (req, res) => {
                 if (err) {
                   console.error(`Error occurred while saving subscription. Err: ${err}`);
                   res.status(500).json({
-                    error: 'Technical error occurred'
+                    error: 'Technical error occurred:' + err
                   });
                 } else {
                   // Send 201 - resource created
diff --git a/server/server.js b/server/server.js
index e8e3b81..be45e5a 100644
--- a/server/server.js
+++ b/server/server.js
@@ -13,7 +13,7 @@ const path = require('path');
 
 i18n = require("i18n");
 
-if (process.env.NODE_ENV === 'production') {
+if ((process.env.NODE_ENV === 'production') || (process.env.NODE_ENV === 'test')) {
   var privateKey = fs.readFileSync(process.env.PATH_CERT_KEY, 'utf8');
   var certificate = fs.readFileSync(process.env.PATH_SERVER_CRT, 'utf8');
   var credentials = { key: privateKey, cert: certificate };
@@ -81,7 +81,6 @@ app.use('/users', users_router);
 //   next(err);
 // });
 
-
 // app.set('views', path.join(__dirname, 'views'));
 // app.set('view engine', 'pug');
 
@@ -99,7 +98,7 @@ if (app.get('env') === 'development') {
   });
 }
 
-if (process.env.NODE_ENV === 'production') {
+if ((process.env.NODE_ENV === 'production') || (process.env.NODE_ENV === 'test')) {
   var httpsServer = https.createServer(credentials, app);
   console.log("httpsServer: port ", port);
   httpsServer.listen(port);