mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Refactor startup/shutdown for tests

Browse source 
* `src/node/server.js` can now be run as a script (for normal
    operation) or imported as a module (for tests).
  * Move shutdown actions to `src/node/server.js` to be close to the
    startup actions.
  * Put startup and shutdown in functions so that tests can call them.
  * Use `await` instead of callbacks.
  * Block until the HTTP server is listening to avoid races during
    test startup.
  * Add a new `shutdown` hook.
  * Use the `shutdown` hook to:
      * close the HTTP server
      * call `end()` on the stats collection to cancel its timers
      * call `terminate()` on the Threads.Pool to stop the workers
  * Exit with exit code 0 (instead of 1) on SIGTERM.
  * Export the HTTP server so that tests can get the HTTP server's
    port via `server.address().port` when `settings.port` is 0.
This commit is contained in:
Richard Hansen 2020-09-21 00:42:29 -04:00 • committed by John McLear
parent a4be577ed1
commit a000a93dc6
11 changed files with 171 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/node/hooks/express.js
View file

@ -5,18 +5,20 @@ var fs = require('fs');
var path = require('path');
var npm = require("npm/lib/npm.js");
var _ = require("underscore");
const util = require('util');
var server;
var serverName;
exports.createServer = function () {
exports.server = null;
exports.createServer = async () => {
console.log("Report bugs at https://github.com/ether/etherpad-lite/issues")
serverName = `Etherpad ${settings.getGitCommit()} (https://etherpad.org)`;
console.log(`Your Etherpad version is ${settings.getEpVersion()} (${settings.getGitCommit()})`);
exports.restartServer();
await exports.restartServer();
if (settings.ip === "") {
// using Unix socket for connectivity
@ -38,10 +40,10 @@ exports.createServer = function () {
}
}
exports.restartServer = function () {
if (server) {
exports.restartServer = async () => {
if (exports.server) {
console.log("Restarting express server");
server.close();
await util.promisify(exports.server.close).bind(exports.server)();
}
var app = express(); // New syntax for express v3
@ -65,10 +67,10 @@ exports.restartServer = function () {
}
var https = require('https');
server = https.createServer(options, app);
exports.server = https.createServer(options, app);
} else {
var http = require('http');
server = http.createServer(app);
exports.server = http.createServer(app);
}
app.use(function(req, res, next) {
@ -110,7 +112,12 @@ exports.restartServer = function () {
}
hooks.callAll("expressConfigure", {"app": app});
hooks.callAll("expressCreateServer", {"app": app, "server": server});
hooks.callAll('expressCreateServer', {app, server: exports.server});
server.listen(settings.port, settings.ip);
}
await util.promisify(exports.server.listen).bind(exports.server)(settings.port, settings.ip);
};
exports.shutdown = async (hookName, context) => {
if (!exports.server) return;
await util.promisify(exports.server.close).bind(exports.server)();
};