Skip to content
Snippets Groups Projects
Commit 1981a9f9 authored by mcmlxxix's avatar mcmlxxix
Browse files

fix service failing to load modules if "sbbs/ctrl/undefined" is a valid file....

fix service failing to load modules if "sbbs/ctrl/undefined" is a valid file. (created if file.open() called on a new File(fileName) where fileName is undefined)
parent 17d34815
No related branches found
No related tags found
No related merge requests found
......@@ -2,15 +2,6 @@ load("event-timer.js");
load("json-sock.js");
load("json-db.js");
// Running from jsexec presumably...
if(js.global.server==undefined) {
load("sockdefs.js");
server={};
server.socket=new Socket(SOCK_STREAM, 'JSONDB');
server.socket.bind(10088,'127.0.0.1');
server.socket.listen();
}
/**** SERVICE MODULES
*
* main service (socket service)
......@@ -58,14 +49,27 @@ if(js.global.server==undefined) {
*
* */
/* Running from jsexec presumably... */
if(js.global.server==undefined) {
load("sockdefs.js");
server={};
server.socket=new Socket(SOCK_STREAM, 'JSONDB');
server.socket.bind(10088,'127.0.0.1');
server.socket.listen();
}
/* service module initialization file */
var serviceIniFile;
if(file_exists(system.ctrl_dir + argv[0]))
serviceIniFile = system.ctrl_dir + argv[0];
else
if(argv[0] != undefined) {
if(file_exists(system.ctrl_dir + argv[0]))
serviceIniFile = system.ctrl_dir + argv[0];
else
throw("service initialization file missing: " + system.ctrl_dir + argv[0]);
}
else {
serviceIniFile = system.ctrl_dir + "json-service.ini";
}
/* error values */
var errors = {
UNKNOWN_MODULE:"Unknown module: %s",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment