Handle shutdown for RedisCacheAdapter (#6658)
* Handle shutdown for RedisCacheAdapter * connected value need to be tested in setTimeout Co-authored-by: Promise Xu <promise@klido.me>
This commit is contained in:
@@ -85,7 +85,7 @@ class ParseServer {
|
||||
serverStartComplete();
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
.catch((error) => {
|
||||
if (serverStartComplete) {
|
||||
serverStartComplete(error);
|
||||
} else {
|
||||
@@ -126,6 +126,10 @@ class ParseServer {
|
||||
if (fileAdapter && typeof fileAdapter.handleShutdown === 'function') {
|
||||
promises.push(fileAdapter.handleShutdown());
|
||||
}
|
||||
const { adapter: cacheAdapter } = this.config.cacheController;
|
||||
if (cacheAdapter && typeof cacheAdapter.handleShutdown === 'function') {
|
||||
promises.push(cacheAdapter.handleShutdown());
|
||||
}
|
||||
return (promises.length > 0
|
||||
? Promise.all(promises)
|
||||
: Promise.resolve()
|
||||
@@ -154,7 +158,7 @@ class ParseServer {
|
||||
})
|
||||
);
|
||||
|
||||
api.use('/health', function(req, res) {
|
||||
api.use('/health', function (req, res) {
|
||||
res.json({
|
||||
status: 'ok',
|
||||
});
|
||||
@@ -179,7 +183,7 @@ class ParseServer {
|
||||
if (!process.env.TESTING) {
|
||||
//This causes tests to spew some useless warnings, so disable in test
|
||||
/* istanbul ignore next */
|
||||
process.on('uncaughtException', err => {
|
||||
process.on('uncaughtException', (err) => {
|
||||
if (err.code === 'EADDRINUSE') {
|
||||
// user-friendly message for this common error
|
||||
process.stderr.write(
|
||||
@@ -192,7 +196,7 @@ class ParseServer {
|
||||
});
|
||||
// verify the server url after a 'mount' event is received
|
||||
/* istanbul ignore next */
|
||||
api.on('mount', function() {
|
||||
api.on('mount', function () {
|
||||
ParseServer.verifyServerUrl();
|
||||
});
|
||||
}
|
||||
@@ -334,8 +338,8 @@ class ParseServer {
|
||||
if (Parse.serverURL) {
|
||||
const request = require('./request');
|
||||
request({ url: Parse.serverURL.replace(/\/$/, '') + '/health' })
|
||||
.catch(response => response)
|
||||
.then(response => {
|
||||
.catch((response) => response)
|
||||
.then((response) => {
|
||||
const json = response.data || null;
|
||||
if (
|
||||
response.status !== 200 ||
|
||||
@@ -368,7 +372,7 @@ function addParseCloud() {
|
||||
}
|
||||
|
||||
function injectDefaults(options: ParseServerOptions) {
|
||||
Object.keys(defaults).forEach(key => {
|
||||
Object.keys(defaults).forEach((key) => {
|
||||
if (!Object.prototype.hasOwnProperty.call(options, key)) {
|
||||
options[key] = defaults[key];
|
||||
}
|
||||
@@ -424,12 +428,12 @@ function injectDefaults(options: ParseServerOptions) {
|
||||
}
|
||||
|
||||
// Merge protectedFields options with defaults.
|
||||
Object.keys(defaults.protectedFields).forEach(c => {
|
||||
Object.keys(defaults.protectedFields).forEach((c) => {
|
||||
const cur = options.protectedFields[c];
|
||||
if (!cur) {
|
||||
options.protectedFields[c] = defaults.protectedFields[c];
|
||||
} else {
|
||||
Object.keys(defaults.protectedFields[c]).forEach(r => {
|
||||
Object.keys(defaults.protectedFields[c]).forEach((r) => {
|
||||
const unq = new Set([
|
||||
...(options.protectedFields[c][r] || []),
|
||||
...defaults.protectedFields[c][r],
|
||||
@@ -453,7 +457,7 @@ function configureListeners(parseServer) {
|
||||
const sockets = {};
|
||||
/* Currently, express doesn't shut down immediately after receiving SIGINT/SIGTERM if it has client connections that haven't timed out. (This is a known issue with node - https://github.com/nodejs/node/issues/2642)
|
||||
This function, along with `destroyAliveConnections()`, intend to fix this behavior such that parse server will close all open connections and initiate the shutdown process as soon as it receives a SIGINT/SIGTERM signal. */
|
||||
server.on('connection', socket => {
|
||||
server.on('connection', (socket) => {
|
||||
const socketId = socket.remoteAddress + ':' + socket.remotePort;
|
||||
sockets[socketId] = socket;
|
||||
socket.on('close', () => {
|
||||
@@ -461,7 +465,7 @@ function configureListeners(parseServer) {
|
||||
});
|
||||
});
|
||||
|
||||
const destroyAliveConnections = function() {
|
||||
const destroyAliveConnections = function () {
|
||||
for (const socketId in sockets) {
|
||||
try {
|
||||
sockets[socketId].destroy();
|
||||
@@ -471,7 +475,7 @@ function configureListeners(parseServer) {
|
||||
}
|
||||
};
|
||||
|
||||
const handleShutdown = function() {
|
||||
const handleShutdown = function () {
|
||||
process.stdout.write('Termination signal received. Shutting down.');
|
||||
destroyAliveConnections();
|
||||
server.close();
|
||||
|
||||
Reference in New Issue
Block a user