refactor app.coffee

monitor/app.coffee

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 http = require 'http'
 url = require 'url'
 fs = require 'fs'
@@ -35,26 +34,4 @@ exports.runWebSocket = (port) ->
 
 unless module.parent
   app = exports.runWebServer()
-  exports.runWebSocket app
-
-=======
-handler = (req, res) ->
-  reqfile = url.parse(req.url).pathname.slice(1).match(/[a-zA-Z0-9_ -.]+/) ? "index.html"
-  fs.readFile "../static/" + reqfile, (err, data) ->
-    if err
-      res.writeHead 500
-      return res.end("Error loading " + reqfile)
-    res.writeHead 200
-    res.end(data);
-
-Monitor = require("./Monitor")
-url = require('url')
-app = require("http").createServer(handler)
-io = require("socket.io").listen(app)
-fs = require("fs")
-app.listen 2998
-
-io.sockets.on "connection", (socket) ->
-  setInterval(Monitor.osData, 1000, socket)
-  setInterval(Monitor.memData, 5000, socket)
->>>>>>> dev
+  exports.runWebSocket app