Simplify/fix nodejs servers for current nodejs/node-static version

jazminGP · May 20, 2013 · 9fbba36 · 9fbba36
1 parent 3fae834
commit 9fbba36
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 43 deletions.
diff --git a/server/server_hpfeeds.js b/server/server_hpfeeds.js
@@ -6,7 +6,7 @@ var util = require('util');
 var ns = require('node-static');
 var io = require('socket.io').listen(app);
 var hpfeeds = require('hpfeeds');
-var file = new(ns.Server)("../static/", { cache: 600 });
+var file = new(ns.Server)("../static", { cache: 600 });
 var sanitize = require('validator').sanitize;
 
 eval(fs.readFileSync('server_hpfeeds_config.js').toString());
@@ -21,7 +21,7 @@ io.enable('browser client etag');          // apply etag caching logic based on
 io.enable('browser client gzip');          // gzip the file
 io.set('log level', 1);                    // reduce logging
 
-// hp feed
+// hpfeeds
 var feedconn = new hpfeeds.HPC(
   config.hpfeeds.server,
   config.hpfeeds.port,
@@ -34,18 +34,12 @@ feedconn.onready(function() { feedconn.subscribe('geoloc.events'); });
 function handler (req, res) {
   try {
     console.log('New request: ' + req.connection.remoteAddress + ': ' + url.parse(req.url).href);
-    req.addListener('end', function() {
-      file.serve(req, res, function(err, result) {
-        if (err) {
-          console.error('Error serving %s: %s', req.url, err.message);
-          if (err.status === 404 || err.status === 500) {
-            file.serveFile(util.format('/errors/%d.html', err.status), err.status, {}, req, res);
-          } else {
-            res.writeHead(err.status, err.headers);
-            res.end();
-          }
-        }
-      });
+    file.serve(req, res, function(err, result) {
+      if (err) {
+        console.error('Error serving %s: %s', req.url, err.message);
+        res.writeHead(err.status, err.headers);
+        res.end();
+      }
     });
   } catch(err) {
     sys.puts(err);
@@ -63,7 +57,7 @@ feedconn.msgcb = function(id, chan, data) {
 
       latitude2: data.latitude2, longitude2: data.longitude2,
       countrycode2: data.countrycode2, country2: data.country2, city2: data.city2,
- 
+
       type: data.type ? sanitize(data.type).xss() : null,
       md5: data.md5 ? sanitize(data.md5).xss() : null
     });

diff --git a/server/server_hpfeeds_config.js.example b/server/server_hpfeeds_config.js.example
@@ -3,7 +3,7 @@ var config = {
   uid: 1000,
   hpfeeds: {
     server: 'hpfeeds.honeycloud.net',
-    port: 10000,
+    port: 20000,
     ident: 'MyUsername',
     auth: 'MyPassword'
   }

diff --git a/server/server_random.js b/server/server_random.js
@@ -5,25 +5,19 @@ var fs = require('fs');
 var util = require('util');
 var ns = require('node-static');
 var io = require('socket.io').listen(app);
-var file = new(ns.Server)("../static/", { cache: 600 });
+var file = new(ns.Server)("../static", { cache: 600 });
 
 // Listen on port 1337
 app.listen(1337);
 
 // Serve static content
 function handler (req, res) {
-  req.addListener('end', function() {
-    file.serve(req, res, function(err, result) {
-      if (err) {
-        console.error('Error serving %s - %s', req.url, err.message);
-        if (err.status === 404 || err.status === 500) {
-          file.serveFile(util.format('/%d.html', err.status), err.status, {}, req, res);
-        } else {
-          res.writeHead(err.status, err.headers);
-          res.end();
-        }
-      }
-    });
+  file.serve(req, res, function(err, result) {
+    if (err) {
+      console.error('Error serving %s - %s', req.url, err.message);
+      res.writeHead(err.status, err.headers);
+      res.end();
+    }
   });
 }
 

diff --git a/server/server_udp.js b/server/server_udp.js
@@ -36,18 +36,12 @@ udpserver.bind(41234);
 function handler (req, res) {
   try {
     console.log('New request: ' + req.connection.remoteAddress + ': ' + url.parse(req.url).href);
-    req.addListener('end', function() {
-      file.serve(req, res, function(err, result) {
-        if (err) {
-          console.error('Error serving %s: %s', req.url, err.message);
-          if (err.status === 404 || err.status === 500) {
-            file.serveFile(util.format('/%d.html', err.status), err.status, {}, req, res);
-          } else {
-            res.writeHead(err.status, err.headers);
-            res.end();
-          }
-        }
-      });
+    file.serve(req, res, function(err, result) {
+      if (err) {
+        console.error('Error serving %s: %s', req.url, err.message);
+        res.writeHead(err.status, err.headers);
+        res.end();
+      }
     });
   } catch(err) {
     sys.puts(err);
@@ -59,7 +53,7 @@ function handler (req, res) {
 udpserver.on("message", function (msg, rinfo) {
   console.log("server got: " + msg.toString() + "(" + typeof(msg) + " from " +
     rinfo.address + ":" + rinfo.port);
-  
+
   try {
     msg = msg.toString();
     msg = msg.replace("\n", "");
@@ -82,7 +76,7 @@ udpserver.on("message", function (msg, rinfo) {
 
       // latitude2: data.latitude2, longitude2: data.longitude2,
       // countrycode2: data.countrycode2, country2: data.country2, city2: data.city2,
- 
+
       // type: data.type ? sanitize(data.type).xss() : null,
       // md5: data.md5 ? sanitize(data.md5).xss() : null
     });