Skip to content

Graceful Shutdown for Cloud-Native Environments #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gabriel-indik merged 2 commits into from
Jul 2, 2021
Merged

Graceful Shutdown for Cloud-Native Environments #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90169fb
Graceful Shutdown for Cloud-Native Environments
onelapahead Jul 2, 2021
067a924
Ensuring all webservers are stopped before exiting
onelapahead Jul 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 28 additions & 5 deletions src/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import express from 'express';
import http from 'http';
import https, { Server } from 'https';
import https from 'https';
import path from 'path';
import swaggerUi from 'swagger-ui-express';
import WebSocket from 'ws';
Expand All @@ -36,7 +36,9 @@ const log = new Logger("app.ts");

const swaggerDocument = YAML.load(path.join(__dirname, './swagger.yaml'));

let p2pServer : Server
let p2pServer : https.Server
let apiServer : http.Server
let wss : WebSocket.Server

let delegatedWebSocket: WebSocket | undefined = undefined;

Expand All @@ -51,12 +53,12 @@ export const start = async () => {
await initCert();

const apiApp = express();
const apiServer = http.createServer(apiApp);
apiServer = http.createServer(apiApp);

const p2pApp = express();
p2pServer = https.createServer(genTLSContext(), p2pApp);

const wss = new WebSocket.Server({
wss = new WebSocket.Server({
server: apiServer, verifyClient: (info, cb) => {
if (config.api === undefined || info.req.headers['x-api-key'] === config.apiKey) {
cb(true);
Expand Down Expand Up @@ -141,7 +143,28 @@ export const start = async () => {
const apiServerPromise = new Promise<void>(resolve => apiServer.listen(config.api.port, config.api.hostname, () => resolve()));
const p2pServerPromise = new Promise<void>(resolve => p2pServer.listen(config.p2p.port, config.p2p.hostname, () => resolve()));
await Promise.all([apiServerPromise, p2pServerPromise]);
log.info(`Data exchange running on http://${config.api.hostname}:${config.api.port} (API) and ` +
log.info(`FireFly Data Exchange running on http://${config.api.hostname}:${config.api.port} (API) and ` +
`https://${config.p2p.hostname}:${config.p2p.port} (P2P) - log level "${utils.constants.LOG_LEVEL}"`);

};

const shutdownHandler = (resolve : (value: void | PromiseLike<void>) => void) => {
return (err: Error | undefined) => {
if (err === undefined) {
resolve();
} else {
log.error(`Failed to close server due to ${err}`);
}
};
};

export const stop = async () => {
// add any additional logic for ensuring clients and handlers are finished with their work before shutting down
log.info("FireFly Data Exchange is gracefully shutting down the webservers");
const apiServerPromise = new Promise<void>(resolve => apiServer.close( shutdownHandler(resolve)));
const p2pServerPromise = new Promise<void>(resolve => p2pServer.close( shutdownHandler(resolve)));
const wssPromise = new Promise<void>(resolve => wss.close(shutdownHandler(resolve)));
await Promise.all([apiServerPromise, p2pServerPromise, wssPromise]);
log.info("FireFly Data Exchange has stopped all webservers, exiting");
process.exit();
};
8 changes: 6 additions & 2 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import { start } from './app';
import { start, stop } from './app';
import { Logger } from './lib/logger';

const log = new Logger("index.ts")

process.on('SIGINT', stop);
process.on('SIGTERM', stop);
process.on('SIGQUIT', stop);

start().catch(err => {
log.error(`Failed to FireFly Data Exchange ${err}`);
log.error(`Failed to start FireFly Data Exchange ${err}`);
});