From 85e7b4b5713355f9ab95ddac997982ce3cea14d7 Mon Sep 17 00:00:00 2001
From: jomo <github@jomo.tv>
Date: Sun, 16 Aug 2015 22:18:17 +0200
Subject: [PATCH] remove clusters

clusters aren't supported, see #80
until we actually use clusters, having a main AND a single worker cluster just makes things more difficult
---
 config.example.js |  1 -
 lib/logging.js    |  4 +---
 www.js            | 18 ++----------------
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/config.example.js b/config.example.js
index be165d5..3ce042d 100644
--- a/config.example.js
+++ b/config.example.js
@@ -29,7 +29,6 @@ var config = {
   server: {
     http_timeout: 1000,             // ms until connection to Mojang is dropped
     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
   }
 };
diff --git a/lib/logging.js b/lib/logging.js
index b39844f..668bd89 100644
--- a/lib/logging.js
+++ b/lib/logging.js
@@ -1,4 +1,3 @@
-var cluster = require("cluster");
 var config = require("../config");
 
 var exp = {};
@@ -18,10 +17,9 @@ function join_args(args) {
 function log(level, args, logger) {
   logger = logger || console.log;
   var time = config.server.log_time ? new Date().toISOString() + " " : "";
-  var clid = (cluster.worker && cluster.worker.id || "M");
   var lines = join_args(args).split("\n");
   for (var i = 0, l = lines.length; i < l; i++) {
-    logger(time + clid, level + ":", lines[i]);
+    logger(time, level + ":", lines[i]);
   }
 }
 
diff --git a/www.js b/www.js
index 0b649ff..2a52daf 100644
--- a/www.js
+++ b/www.js
@@ -1,26 +1,12 @@
 var logging = require("./lib/logging");
 var cleaner = require("./lib/cleaner");
 var config = require("./config");
-var cluster = require("cluster");
 
 process.on("uncaughtException", function(err) {
   logging.error("uncaughtException", err.stack || err.toString());
   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();
-  }
+setInterval(cleaner.run, config.cleaner.interval * 1000);
 
-  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);
-} else {
-  require("./lib/server.js").boot();
-}
\ No newline at end of file
+require("./lib/server.js").boot();
\ No newline at end of file