Merge remote branch 'bnoordhuis/metrics'

Conflicts: server/README.md
tslater · Apr 6, 2012 · b49c329 · b49c329
2 parents f580f2f + cfa6f44
commit b49c329
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/server/README.md b/server/README.md
@@ -9,7 +9,7 @@ The game server currently runs on nodejs v0.4.7 (but should run fine on the late
 - websocket
 - websocket-server
 - sanitizer
-- memcache
+- memcache (only if you want metrics)
 
 All of them can be installed via `npm install -d` (this will install a local copy of all the dependencies in the node_modules directory)
 

diff --git a/server/js/main.js b/server/js/main.js
@@ -44,7 +44,7 @@ function main(config) {
                 }
             };
 
-        if(config.metrics_enabled) {
+        if(metrics) {
             metrics.getOpenWorldCount(function(open_world_count) {
                 // choose the least populated world among open worlds
                 world = _.min(_.first(worlds, open_world_count), function(w) { return w.playerCount; });
@@ -78,8 +78,7 @@ function main(config) {
         var world = new WorldServer('world'+ (i+1), config.nb_players_per_world, server);
         world.run(config.map_filepath);
         worlds.push(world);
-
-        if(config.metrics_enabled) {
+        if(metrics) {
             world.onPlayerAdded(onPopulationChange);
             world.onPlayerRemoved(onPopulationChange);
         }

diff --git a/server/js/metrics.js b/server/js/metrics.js
@@ -1,14 +1,13 @@
 
 var cls = require("./lib/class"),
-    _ = require("underscore"),
-    memcache = require("memcache");
+    _ = require("underscore");
 
 module.exports = Metrics = Class.extend({
     init: function(config) {
         var self = this;
 
         this.config = config;
-        this.client = new memcache.Client(config.memcached_port, config.memcached_host),
+        this.client = new require("memcache").Client(config.memcached_port, config.memcached_host),
         this.client.connect();
         this.isReady = false;
 
@@ -73,4 +72,4 @@ module.exports = Metrics = Class.extend({
             callback(result);
         });
     }
-});
+});