Fix minor issues I thought I'd already fixed.

Knewton · May 9, 2012 · 9c5bada · 9c5bada
1 parent 63f3910
commit 9c5bada
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/config.js b/config.js
@@ -1,6 +1,5 @@
 var fs  = require('fs')
   , util = require('util')
-  , sys = require('sys')
 
 var Configurator = function (file) {
 

diff --git a/stats.js b/stats.js
@@ -291,14 +291,13 @@ config.configFile(process.argv[2], function (config, oldConfig) {
       }
 
       statString += 'statsd.numStats ' + numStats + ' ' + ts + "\n";
-<<<<<<< HEAD
 
       if (config.graphiteHost) {
         try {
           var graphite = net.createConnection(config.graphitePort, config.graphiteHost);
           graphite.addListener('error', function(connectionException){
             if (config.debug) {
-              sys.log(connectionException);
+              util.log(connectionException);
             }
           });
           graphite.on('connect', function() {
@@ -308,7 +307,7 @@ config.configFile(process.argv[2], function (config, oldConfig) {
           });
         } catch(e){
           if (config.debug) {
-            sys.log(e);
+            util.log(e);
           }
           stats['graphite']['last_exception'] = Math.round(new Date().getTime() / 1000);
         }