azures04/crafatar
1
0
Fork 0
mirror of https://github.com/azures04/crafatar.git synced 2026-03-21 23:41:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove clusters

Browse Source 
clusters aren't supported, see #80
until we actually use clusters, having a main AND a single worker cluster just makes things more difficult
This commit is contained in:
jomo 2015-08-16 22:18:17 +02:00
parent 72708ca590
commit 85e7b4b571
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.example.js
View File

@ -29,7 +29,6 @@ var config = {
server: { server: {
http_timeout: 1000, // ms until connection to Mojang is dropped http_timeout: 1000, // ms until connection to Mojang is dropped
debug_enabled: false, // enables logging.debug debug_enabled: false, // enables logging.debug
clusters: 1, // we recommend not using multiple clusters YET, see issue #80
log_time: true // set to false if you use an external logger that provides timestamps log_time: true // set to false if you use an external logger that provides timestamps
} }
}; };

4
lib/logging.js
View File

@ -1,4 +1,3 @@
var cluster = require("cluster");
var config = require("../config"); var config = require("../config");
var exp = {}; var exp = {};
@ -18,10 +17,9 @@ function join_args(args) {
function log(level, args, logger) { function log(level, args, logger) {
logger = logger || console.log; logger = logger || console.log;
var time = config.server.log_time ? new Date().toISOString() + " " : ""; var time = config.server.log_time ? new Date().toISOString() + " " : "";
var clid = (cluster.worker && cluster.worker.id || "M");
var lines = join_args(args).split("\n"); var lines = join_args(args).split("\n");
for (var i = 0, l = lines.length; i < l; i++) { for (var i = 0, l = lines.length; i < l; i++) {
logger(time + clid, level + ":", lines[i]); logger(time, level + ":", lines[i]);
} }
} }

16
www.js
View File

@ -1,26 +1,12 @@
var logging = require("./lib/logging"); var logging = require("./lib/logging");
var cleaner = require("./lib/cleaner"); var cleaner = require("./lib/cleaner");
var config = require("./config"); var config = require("./config");
var cluster = require("cluster");
process.on("uncaughtException", function(err) { process.on("uncaughtException", function(err) {
logging.error("uncaughtException", err.stack || err.toString()); logging.error("uncaughtException", err.stack || err.toString());
process.exit(1); process.exit(1);
}); });
if (cluster.isMaster) {
var cores = config.server.clusters || require("os").cpus().length;
logging.log("Starting", cores + " worker" + (cores > 1 ? "s" : ""));
for (var i = 0; i < cores; i++) {
cluster.fork();
}
cluster.on("exit", function (worker) {
logging.error("Worker #" + worker.id + " died. Rebooting a new one.");
setTimeout(cluster.fork, 100);
});
setInterval(cleaner.run, config.cleaner.interval * 1000); setInterval(cleaner.run, config.cleaner.interval * 1000);
} else {
require("./lib/server.js").boot(); require("./lib/server.js").boot();
}