liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: Graceful shutdown with git sync

Browse Source
This commit is contained in:
NGPixel 2017-05-18 20:23:24 -04:00
parent f5cce0e1f4
commit d744eb4d4c
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -1,10 +1,10 @@
FROM node:latest FROM node:6-alpine
ENV WIKI_JS_DOCKER 1 ENV WIKI_JS_DOCKER 1
RUN mkdir -p /usr/src/app RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app WORKDIR /usr/src/app
RUN yarn add wiki.js@latest RUN npm install wiki.js@latest
EXPOSE 3000 EXPOSE 3000
CMD [ "node", "server" ] CMD [ "node", "server" ]

1
package.json
View File

@ -92,6 +92,7 @@
"mongodb": "^2.2.26", "mongodb": "^2.2.26",
"mongoose": "^4.9.9", "mongoose": "^4.9.9",
"multer": "^1.3.0", "multer": "^1.3.0",
"node-graceful": "^0.2.3",
"ora": "^1.2.0", "ora": "^1.2.0",
"passport": "^0.3.2", "passport": "^0.3.2",
"passport-azure-ad-oauth2": "0.0.4", "passport-azure-ad-oauth2": "0.0.4",

19
server/index.js
View File

@ -16,9 +16,9 @@ const IS_DEBUG = process.env.NODE_ENV === 'development'
process.env.VIPS_WARNING = false process.env.VIPS_WARNING = false
if (IS_DEBUG) { // if (IS_DEBUG) {
require('@glimpse/glimpse').init() // require('@glimpse/glimpse').init()
} // }
let appconf = require('./libs/config')() let appconf = require('./libs/config')()
global.appconfig = appconf.config global.appconfig = appconf.config
@ -62,6 +62,7 @@ const passport = require('passport')
const passportSocketIo = require('passport.socketio') const passportSocketIo = require('passport.socketio')
const session = require('express-session') const session = require('express-session')
const SessionMongoStore = require('connect-mongo')(session) const SessionMongoStore = require('connect-mongo')(session)
const graceful = require('node-graceful')
const socketio = require('socket.io') const socketio = require('socket.io')
var mw = autoload(path.join(SERVERPATH, '/middlewares')) var mw = autoload(path.join(SERVERPATH, '/middlewares'))
@ -257,6 +258,14 @@ bgAgent.on('message', m => {
} }
}) })
process.on('exit', (code) => { // ----------------------------------------
bgAgent.disconnect() // Graceful shutdown
// ----------------------------------------
graceful.on('exit', () => {
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')
})
}) })

4
yarn.lock
View File

@ -4569,6 +4569,10 @@ node-abi@^2.0.0:
version "2.0.2" version "2.0.2"
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.0.2.tgz#00f3e0a58100eb480133b48c99a32cc1f9e6c93e" resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.0.2.tgz#00f3e0a58100eb480133b48c99a32cc1f9e6c93e"
node-graceful@^0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/node-graceful/-/node-graceful-0.2.3.tgz#ab120e1eed8c0c2b5e2ac874bf2754519c3fa942"
node-gyp@^3.3.1: node-gyp@^3.3.1:
version "3.6.1" version "3.6.1"
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.1.tgz#19561067ff185464aded478212681f47fd578cbc" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.1.tgz#19561067ff185464aded478212681f47fd578cbc"