Skip to content

Commit 6470eac

Browse files
committed
fix auto install
1 parent d0c0e1c commit 6470eac

13 files changed

Lines changed: 106 additions & 254 deletions

OpenFlow/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,5 +257,6 @@ try {
257257
} catch (error) {
258258
console.error(error.message ? error.message : error);
259259
logger.error(error.message ? error.message : error);
260+
process.exit(404);
260261
}
261262
})();

OpenFlowNodeRED/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{
22
"name": "openflow-nodered",
3-
"version": "1.1.43",
3+
"version": "1.1.47",
44
"description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
55
"main": "index.js",
66
"scripts": {
77
"test": "echo \"Error: no test specified\" && exit 1",
8-
"postinstall_old": "node -e \"try{require('./postinstall')}catch(e){console.log(e)}\"",
98
"prepare": "gulp clean"
109
},
1110
"repository": {

OpenFlowNodeRED/postinstall.js

Lines changed: 0 additions & 100 deletions
This file was deleted.

OpenFlowNodeRED/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { WebServer } from "./WebServer";
88
import { Config } from "./Config";
99
import { Crypt } from "./nodeclient/Crypt";
1010
import { FileSystemCache } from "openflow-api";
11+
import { RestartService } from "./nodeclient/cliutil";
1112

1213
const logger: winston.Logger = Logger.configure();
1314
logger.info("starting openflow nodered");

OpenFlowNodeRED/src/node-red-contrib-openflow-storage.ts

Lines changed: 81 additions & 43 deletions
Large diffs are not rendered by default.

OpenFlowNodeRED/src/nodeclient/cliutil.ts

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { Config } from "../Config";
33
import * as fs from "fs";
44
export const logger = Logger.configure();
55
const cp = require('child_process');
6+
const spawn = cp.spawn;
67
const path = require('path');
78
const envfile = require('envfile')
89
export const envfilename = ".env";
@@ -54,12 +55,25 @@ export function RestartService(servicename: string) {
5455
try {
5556
if (isWin()) {
5657
// cp.execSync(`start "restart" "cmd.exe" "/c net stop ${servicename} & net start ${servicename}"`);
57-
cp.exec(`start "restart" "cmd.exe" "/c net stop ${servicename} & net start ${servicename}"`);
58+
// cp.exec(`start "restart" "cmd.exe" "/c net stop ${servicename} & net start ${servicename}"`);
59+
// var child = spawn("powershell.exe", ["-Command", `Restart-Service ${servicename}`, "-NoExit"], {
60+
var child = spawn("cmd", [`start "restart" "cmd.exe" "/c net stop ${servicename} & net start ${servicename}"`], {
61+
shell: true, detached: true,
62+
stdio: ['ignore', 'ignore', 'ignore']
63+
});
64+
child.unref();
5865
} else if (isMac()) {
5966
// https://medium.com/craftsmenltd/building-a-cross-platform-background-service-in-node-js-791cfcd3be60
6067
// cp.execSync(`sudo launchctl unload ${LAUNCHD_PLIST_PATH}`);
6168
} else {
62-
cp.execSync(`service ${servicename} restart`);
69+
// cp.execSync(`service ${servicename} restart`);
70+
// var child = spawn(`service ${servicename} restart`, [], {
71+
var child = spawn("service", [`${servicename} restart`], {
72+
shell: true, detached: true,
73+
stdio: ['ignore', 'ignore', 'ignore']
74+
});
75+
child.unref();
76+
6377
}
6478
} catch (error) {
6579
logger.info(error.message ? error.message : error);

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.43
1+
1.1.47

docker-compose-toolbox.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ services:
8282
- "traefik.http.routers.nodered.rule=Host(`nodered1.toolbox.openrpa.dk`)"
8383
- "traefik.http.routers.nodered.entrypoints=web"
8484
- "traefik.http.services.nodered.loadbalancer.server.port=1880"
85-
image: "cloudhack/openflownodered:1.1.43"
85+
image: "cloudhack/openflownodered:1.1.47"
8686
container_name: "nodered"
8787
environment:
8888
# - nodered_id=1

docker-compose-traefik-letsencrypt.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ services:
107107
- "traefik.http.routers.nodered.entrypoints=web,websecure"
108108
- "traefik.http.services.nodered.loadbalancer.server.port=1880"
109109
- "traefik.http.routers.nodered.tls.certresolver=myresolver"
110-
image: "cloudhack/openflownodered:1.1.43"
110+
image: "cloudhack/openflownodered:1.1.47"
111111
container_name: "nodered"
112112
environment:
113113
# - nodered_id=1

docker-compose-traefik.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ services:
8282
- "traefik.http.routers.nodered.rule=Host(`nodered1.localhost.openrpa.dk`)"
8383
- "traefik.http.routers.nodered.entrypoints=web"
8484
- "traefik.http.services.nodered.loadbalancer.server.port=1880"
85-
image: "cloudhack/openflownodered:1.1.43"
85+
image: "cloudhack/openflownodered:1.1.47"
8686
container_name: "nodered"
8787
environment:
8888
# - nodered_id=1

0 commit comments

Comments
 (0)