Skip to content

Commit

Permalink
add graceful shutdown
Browse files Browse the repository at this point in the history
  • Loading branch information
louislam committed Jul 15, 2021
1 parent f2af5bc commit b3bff8d
Show file tree
Hide file tree
Showing 6 changed files with 98 additions and 12 deletions.
11 changes: 10 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"dayjs": "^1.10.4",
"express": "^4.17.1",
"form-data": "^4.0.0",
"http-graceful-shutdown": "^3.1.2",
"jsonwebtoken": "^8.5.1",
"nodemailer": "^6.6.2",
"password-hash": "^1.2.2",
Expand Down
86 changes: 81 additions & 5 deletions server/server.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
console.log("Welcome to Uptime Kuma ")
console.log("Importing libraries")
const express = require('express');
const app = express();
const http = require('http');
const server = http.createServer(app);
const { Server } = require("socket.io");
const io = new Server(server);
const dayjs = require("dayjs");
const {R} = require("redbean-node");
const passwordHash = require('./password-hash');
Expand All @@ -12,12 +11,20 @@ const Monitor = require("./model/monitor");
const fs = require("fs");
const {getSettings} = require("./util-server");
const {Notification} = require("./notification")
const gracefulShutdown = require('http-graceful-shutdown');
const {sleep} = require("./util");
const args = require('args-parser')(process.argv);

const version = require('../package.json').version;
const hostname = args.host || "0.0.0.0"
const port = args.port || 3001

console.log("Version: " + version)

console.log("Creating express and socket.io instance")
const app = express();
const server = http.createServer(app);
const io = new Server(server);
app.use(express.json())

let totalClient = 0;
Expand Down Expand Up @@ -539,11 +546,11 @@ async function initDatabase() {
const path = './data/kuma.db';

if (! fs.existsSync(path)) {
console.log("Copy Database")
console.log("Copying Database")
fs.copyFileSync("./db/kuma.db", path);
}

console.log("Connect to Database")
console.log("Connecting to Database")

R.setup('sqlite', {
filename: path
Expand Down Expand Up @@ -660,3 +667,72 @@ async function sendImportantHeartbeatList(socket, monitorID) {

socket.emit("importantHeartbeatList", monitorID, list)
}



const startGracefulShutdown = async () => {

This comment has been minimized.

Copy link
@Saibamen

Saibamen Jul 18, 2021

Contributor

This function is unused. Please delete it

console.log('Shutdown requested');


await (new Promise((resolve) => {
server.close(async function () {
console.log('Stopped Express.');
process.exit(0)
setTimeout(async () =>{
await R.close();
console.log("Stopped DB")

resolve();
}, 5000)

});
}));


}

let noReject = true;
process.on('unhandledRejection', (reason, p) => {
noReject = false;
});

async function shutdownFunction(signal) {
console.log('Called signal: ' + signal);

console.log("Stopping all monitors")
for (let id in monitorList) {
let monitor = monitorList[id]
monitor.stop()
}
await sleep(2000)

console.log("Closing DB")

// Special handle, because tarn.js throw a promise reject that cannot be caught
while (true) {
noReject = true;
await R.close()
await sleep(2000)

if (noReject) {
break;
} else {
console.log("Waiting...")
}
}

console.log("OK")
}

function finalFunction() {
console.log('Graceful Shutdown')
}

gracefulShutdown(server, {
signals: 'SIGINT SIGTERM',
timeout: 30000, // timeout: 30 secs
development: false, // not in dev mode
forceExit: true, // triggers process.exit() at the end of shutdown process
onShutdown: shutdownFunction, // shutdown function (async) - e.g. for cleanup DB, ...
finally: finalFunction // finally function (sync) - e.g. for logging
});
4 changes: 2 additions & 2 deletions server/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@



export function sleep(ms) {
exports.sleep = function (ms) {
return new Promise(resolve => setTimeout(resolve, ms));
}

export function ucfirst(str) {
exports.ucfirst = function (str) {
if (! str) {
return str;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/CountUp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<script>
import {sleep} from "../../server/util";
const {sleep} = require("../../server/util")
export default {
Expand Down
6 changes: 3 additions & 3 deletions src/components/NotificationDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
<input type="number" class="form-control" id="gotify-priority" v-model="notification.gotifyPriority" required min="0" max="10" step="1">
</div>
</template>

<template v-if="notification.type === 'slack'">
<div class="mb-3">
<label for="slack-webhook-url" class="form-label">Slack Webhook URL</label>
Expand Down Expand Up @@ -220,7 +220,7 @@

<script>
import { Modal } from 'bootstrap'
import { ucfirst } from "../../server/util";
const {ucfirst} = require("../../server/util")
import axios from "axios";
import { useToast } from 'vue-toastification'
import Confirm from "./Confirm.vue";
Expand Down Expand Up @@ -276,7 +276,7 @@ export default {
name: "",
type: null,
}
// Default set to Telegram
this.notification.type = "telegram"
this.notification.gotifyPriority = 8
Expand Down

0 comments on commit b3bff8d

Please sign in to comment.