From 3adb5cd29547992125261b3c3608019f241ad135 Mon Sep 17 00:00:00 2001 From: Gisle Aune Date: Wed, 2 Jan 2019 13:15:48 +0100 Subject: [PATCH] Updates done over time while in prod. --- index.js | 9 ++++++++- run.sh | 4 ---- www-root/index.html | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) delete mode 100644 run.sh diff --git a/index.js b/index.js index e48f2df..e62cfd5 100644 --- a/index.js +++ b/index.js @@ -5,13 +5,20 @@ var express = require('express'); var morgan = require('morgan') var ngn4 = require('ngn4'); -var config = require('./config.json'); +var config = {port: 8080} var util = require('./util.js'); var scriptMethods = {}; var app = express(); var accessLogStream = fs.createWriteStream(__dirname + '/access.log', {flags: 'a'}); +try { + config = require("./config.json"); +} catch(err) { + console.error("Couldn't load config, using defaults."); + console.error(JSON.stringify(config), ' ', 4); +} + app.use(require('compression')()); app.use(require('cookie-parser')()); app.use(morgan('combined', {stream: accessLogStream})); diff --git a/run.sh b/run.sh deleted file mode 100644 index 867c711..0000000 --- a/run.sh +++ /dev/null @@ -1,4 +0,0 @@ -sudo kill `cat /tmp/server-main.pid` 2>/dev/null -sudo node . & - -echo $! >/tmp/server-main.pid diff --git a/www-root/index.html b/www-root/index.html index cc7885e..8838944 100644 --- a/www-root/index.html +++ b/www-root/index.html @@ -5,6 +5,7 @@ +