From 7e6ec5612890b59ab2e07ddb9e23c79caa695b6d Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Sun, 16 Jul 2017 21:32:33 -0400 Subject: [PATCH 1/3] docs: Update node.js dependency --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 16d17a11..13b46774 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Wiki.js can run on virtually all platforms where Node.js can (Windows, Mac, Linux, etc.). -- Node.js **6.9.0** or later +- Node.js **6.11.1** or later - MongoDB **3.2** or later - Git **2.7.4** or later - An empty Git repository (optional) From d5157a3e76878d27996b72f7a6522a937ba7ced4 Mon Sep 17 00:00:00 2001 From: Benny Neugebauer Date: Mon, 17 Jul 2017 22:04:07 +0200 Subject: [PATCH 2/3] docs: Fixed terminology --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 13b46774..e4ba5dd7 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Current and upcoming milestones *(major features only, see the [changelog](https - [x] Color Themes - [x] Server-side TeX/MathML rendering -- [x] Render linebreaks by default (Github style) +- [x] Render line breaks by default (GitHub style) - [x] New Localization: German ### Beta 14 From 6d7709268f87fdba0705b727ef3defd9cb46b09e Mon Sep 17 00:00:00 2001 From: Oleg Iasinovskyi Date: Thu, 20 Jul 2017 20:13:06 +0300 Subject: [PATCH 3/3] fix: infinite loop on termination signal --- server/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/index.js b/server/index.js index ab675695..07cc3df8 100644 --- a/server/index.js +++ b/server/index.js @@ -266,9 +266,11 @@ bgAgent.on('message', m => { // ---------------------------------------- graceful.on('exit', () => { + global.winston.info('- SHUTTING DOWN - Terminating Background Agent...') + bgAgent.kill() global.winston.info('- SHUTTING DOWN - Performing git sync...') return global.git.resync().then(() => { global.winston.info('- SHUTTING DOWN - Git sync successful. Now safe to exit.') - process.kill(process.pid, 'SIGINT') + process.exit() }) })