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

Added Fetch Image from URL feature + Storm filelocks fixes + bulma inclusion into core

Browse Source
This commit is contained in:
NGPixel
2016-10-16 19:09:43 -04:00
parent 91d524eb06
commit 741a6674af
55 changed files with 3119 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
agent.js
View File

@@ -14,16 +14,6 @@ global.PROCNAME = 'AGENT';
var _isDebug = process.env.NODE_ENV === 'development';
global.winston = require('./libs/winston')(_isDebug);
// ----------------------------------------
// Fetch internal handshake key
// ----------------------------------------
if(!process.argv[2] || process.argv[2].length !== 40) {
winston.error('[WS] Illegal process start. Missing handshake key.');
process.exit(1);
}
global.WSInternalKey = process.argv[2];
// ----------------------------------------
// Load global modules
// ----------------------------------------
@@ -36,7 +26,6 @@ global.upl = require('./libs/uploads-agent').init(appconfig);
global.git = require('./libs/git').init(appconfig);
global.entries = require('./libs/entries').init(appconfig);
global.mark = require('./libs/markdown');
global.ws = require('socket.io-client')('http://localhost:' + appconfig.port, { reconnectionAttempts: 10 });
// ----------------------------------------
// Load modules
@@ -195,22 +184,6 @@ var job = new cron({
runOnInit: true
});
// ----------------------------------------
// Connect to local WebSocket server
// ----------------------------------------
ws.on('connect', function () {
winston.info('[AGENT] Background Agent started successfully! [RUNNING]');
job.start();
});
ws.on('connect_error', function () {
winston.warn('[AGENT] Unable to connect to main server! Retrying...');
});
ws.on('reconnect_failed', function () {
winston.error('[AGENT] Failed to reconnect to main server too many times! Stopping agent...');
process.exit(1);
});
// ----------------------------------------
// Shutdown gracefully