prepare for release

Author: AlexandreDewilde

.gitignore

@@ -28,3 +28,4 @@ node_modules/
 src/config/config.json
 src/key.pem
 src/cert.pem
+src/access.log

src/app.js

@@ -11,7 +11,7 @@ const path = require('path');
 const minify = require('express-minify');
 const logger = require('morgan');
 const compression = require('compression');
-let debug = require('debug');
+const fs = require('fs');
 const index = require('./routes/index');
 const editor = require('./routes/editor');
 const legal = require('./routes/legal');
@@ -27,9 +27,12 @@ nunjucks.configure(path.join(__dirname, 'views'), {
     express: app
 });
 
+// logger files
+var accessLogStream = fs.createWriteStream(path.join(__dirname, 'access.log'), { flags: 'a' })
+
 // Adding middleware
 if (config.PRODUCTION) {
-    app.use(logger('combined'));
+    app.use(logger('combined', { stream: accessLogStream }));
     app.use(compression());
 }
 else {
@@ -38,12 +41,14 @@ else {
 app.use(minify({ jsMatch: false }));
 
 // Prometheus middleware
+// TODO new middleware
 if(config.METRICS){
     app.use(promBundle({
         includeMethod: true,
         includePath: true,
     }));
 }
+
 app.use(express.json());
 app.use(express.urlencoded({extended: false}));
 // Set static folder
@@ -62,7 +67,9 @@ app.all('*', (req, res) => {
 
 // Handle errors
 app.use((error, req, res, next) => {
-    debug(error);
+    if (config.DEBUG) {
+        console.error(error);
+    }
     res.sendStatus(500);
 });
 

src/db/MongoDB.js

@@ -13,7 +13,8 @@ const baseCode = [
 
 class MongoDB {
     constructor (username, password, host, database, port) {
-        const url = `mongodb://${username}:${password}@${host}:${port}/?retryWrites=true&w=majority`;
+        let url = `mongodb://${username}:${password}@${host}:${port}/?retryWrites=true&w=majority`;
+        url = 'mongodb://127.0.0.1:34919/7fd02636-cfe2-4691-980b-8fd1090347c3?';
         this.client = new MongoClient(url);
     }
 
@@ -23,7 +24,9 @@ class MongoDB {
             this.codeWe = await this.db.db('codewe');
             this.documentsCollection = await this.codeWe.collection('codewe');
         } catch (err) {
-            console.error('Error with db connection');
+            if (configs.DEBUG) {
+                console.error('Error with db connection');
+            }
             throw new Error(err);
         }
     }
@@ -47,7 +50,9 @@ class MongoDB {
             this.documentsCollection.updateOne({_id: results.insertedId}, {$set: {documentLink: documentLink}})
             return documentLink;
         } catch (err) {
-            console.error('Error when creating a new document');
+            if (configs.DEBUG) {
+                console.error('Error when creating a new document');
+            }
             throw new Error(err);
         }
 
@@ -57,7 +62,9 @@ class MongoDB {
         try {
             return await this.documentsCollection.findOne({documentLink: documentLink});
         } catch (err) {
-            console.error('Error when fetching document');
+            if (configs.DEBUG) {
+                console.error('Error when fetching document');
+            }
             throw new Error(err);
         }
     }
@@ -66,7 +73,9 @@ class MongoDB {
         try {
             await this.documentsCollection.updateOne({documentLink: documentLink, 'content.uuid': uuid}, {$set: {'content.$.content': content}});
         } catch (err) {
-            console.error('Error when changing line content');
+            if (configs.DEBUG) {
+                console.error('Error when changing line content');
+            }
             throw new Error(err);
         }
     }
@@ -89,7 +98,9 @@ class MongoDB {
                 }
             });
         } catch (err) {
-            console.error('Error when adding a new line to document');
+            if (configs.DEBUG) {
+                console.error('Error when adding a new line to document');
+            }
             throw new Error(err);
         }
     }
@@ -99,7 +110,9 @@ class MongoDB {
             // Delete line at the right place
             await this.documentsCollection.updateOne({documentLink: documentLink}, {$pull: {content: {uuid: uuid}}});
         } catch (err) {
-            console.error('Error when deleting a line in document');
+            if (configs.DEBUG) {
+                console.error('Error when deleting a line in document');
+            }
             throw new Error(err);
         }
 
@@ -124,7 +137,9 @@ class MongoDB {
                 }
             }
         } catch (err) {
-            console.error('Error when applying requests');
+            if (configs.DEBUG) {
+                console.error('Error when applying requests');
+            }
             throw new Error(err);
         }
     }

src/server.js

@@ -32,5 +32,5 @@ require('./socket/socket')(wss);
 
 
 server.listen(port, host, () => {
-    console.log('Server Started!')
+    console.log('Server Started!');
 });