From c32f9d6af19c0283446ff001708f513e538b0ab4 Mon Sep 17 00:00:00 2001 From: Khotul Date: Mon, 15 Aug 2022 19:22:23 +0200 Subject: [PATCH 1/3] Fix bulk-load loading items as "null" --- config/bulk-load.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/config/bulk-load.js b/config/bulk-load.js index af270df..eb309dd 100644 --- a/config/bulk-load.js +++ b/config/bulk-load.js @@ -1,5 +1,13 @@ var rg = require("require-glob"); +const path = require('path'); + module.exports = function (folder) { - var items = rg.sync(__dirname + "/" + folder + "/*.js", {keygen: function (options, file) { return file.path.match(/\/([^\/.]+)\./)[1]; }}); + + var items = rg.sync(__dirname + "/" + folder + "/*.js", {keygen: function (options, file) + { + //console.log("Loading item: " + file.path.replace(file.base + path.sep, '').replace(/.\w*$/, '')); + return file.path.replace(file.base + path.sep, '') + .replace(/.\w*$/, ''); }}); + return items; } From 2330ae54d4e84b3683e0b8d694be68cd6ab1b7c5 Mon Sep 17 00:00:00 2001 From: Khotul Date: Tue, 16 Aug 2022 00:01:39 +0200 Subject: [PATCH 2/3] Fix Respawn function not working (at least on Windows) --- index.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/index.js b/index.js index 4697e7b..32cfdeb 100644 --- a/index.js +++ b/index.js @@ -1,7 +1,8 @@ require("coffee-script/register"); require('app-module-path').addPath(__dirname); var log = require("logger"); -var respawn = require("respawn"); +//var respawn = require("respawn"); +var spawn = require("child_process").spawn; var db = require("database").db; var netconfig = require("config/netconfig"); var path = require("path"); @@ -17,11 +18,14 @@ db.onConnect(1, function (err, connection) { var apps = ["botmanager", "frontend", "gameserver", "lobby"]; apps.forEach(function(appName) { - var app = respawn(['node', path.join(__dirname, './' + appName + "/index.js")], { + /* var app = respawn(['node', ' ' + appName + "/index.js"], { kill: 1000, stdout: process.stdout, stderr: process.stderr }); - app.start(); + console.log("Starting " + appName + " with respawn " + app.pid); + app.start(); */ + var app = spawn('node', [appName + "/index.js"]); + app.stdout.pipe(process.stdout); }); }); From 9f4ff90826bca89ded1b3479abca2c95dc31cedc Mon Sep 17 00:00:00 2001 From: Khotul Date: Tue, 16 Aug 2022 11:00:54 +0200 Subject: [PATCH 3/3] Revert Commit I accidentally pushed to the wrong branch This reverts commit 2330ae54d4e84b3683e0b8d694be68cd6ab1b7c5. --- index.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/index.js b/index.js index 32cfdeb..4697e7b 100644 --- a/index.js +++ b/index.js @@ -1,8 +1,7 @@ require("coffee-script/register"); require('app-module-path').addPath(__dirname); var log = require("logger"); -//var respawn = require("respawn"); -var spawn = require("child_process").spawn; +var respawn = require("respawn"); var db = require("database").db; var netconfig = require("config/netconfig"); var path = require("path"); @@ -18,14 +17,11 @@ db.onConnect(1, function (err, connection) { var apps = ["botmanager", "frontend", "gameserver", "lobby"]; apps.forEach(function(appName) { - /* var app = respawn(['node', ' ' + appName + "/index.js"], { + var app = respawn(['node', path.join(__dirname, './' + appName + "/index.js")], { kill: 1000, stdout: process.stdout, stderr: process.stderr }); - console.log("Starting " + appName + " with respawn " + app.pid); - app.start(); */ - var app = spawn('node', [appName + "/index.js"]); - app.stdout.pipe(process.stdout); + app.start(); }); });