dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor improvements

Browse Source
This commit is contained in:
Igor Kulikov 2022-07-07 14:06:55 +03:00
parent 301aa11122
commit 1d9d938052
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
msa/js-executor/docker/start-js-executor.sh
View File

@ -26,4 +26,5 @@ source "${CONF_FOLDER}/${configfile}"
cd ${pkg.installFolder} cd ${pkg.installFolder}
exec /bin/sh -c "node server.js" # This will forward this PID 1 to the node.js and forward SIGTERM for graceful shutdown as well
exec node server.js

4
msa/js-executor/package.json
View File

@ -8,8 +8,8 @@
"scripts": { "scripts": {
"pkg": "tsc && pkg -t node16-linux-x64,node16-win-x64 --out-path ./target ./target/src && node install.js", "pkg": "tsc && pkg -t node16-linux-x64,node16-win-x64 --out-path ./target ./target/src && node install.js",
"test": "echo \"Error: no test specified\" && exit 1", "test": "echo \"Error: no test specified\" && exit 1",
"start": "nodemon --watch '.' --ext 'ts' --exec 'WEB_FOLDER=./target/web ts-node server.ts'", "start": "nodemon --watch '.' --ext 'ts' --exec 'ts-node server.ts'",
"start-prod": "nodemon --watch '.' --ext 'ts' --exec 'WEB_FOLDER=./target/web NODE_ENV=production ts-node server.ts'", "start-prod": "nodemon --watch '.' --ext 'ts' --exec 'NODE_ENV=production ts-node server.ts'",
"build": "tsc" "build": "tsc"
}, },
"dependencies": { "dependencies": {

5
msa/js-executor/server.ts
View File

@ -71,7 +71,8 @@ let httpServer: HttpServer;
})(); })();
process.on('SIGTERM', () => { process.on('SIGTERM', () => {
process.exit(); logger.info('SIGTERM signal received');
process.exit(0);
}); });
process.on('exit', async () => { process.on('exit', async () => {
@ -81,5 +82,5 @@ process.on('exit', async () => {
if (queues) { if (queues) {
queues.exit(0); queues.exit(0);
} }
logger.info('JavaScript Executor Microservice has been stopped.');
}); });