Accept configuration from environment variables or command line arguments. Unified cluster and HTTP server code for CWMP, NBI, and FS.

lib/fs.coffee

@@ -21,53 +21,29 @@
 ###
 
 config = require './config'
-util = require 'util'
-http = require 'http'
 url = require 'url'
 mongodb = require 'mongodb'
 querystring = require 'querystring'
+db = require './db'
 
-db = null
 
-cluster = require 'cluster'
-numCPUs = require('os').cpus().length
+listener = (request, response) ->
+  urlParts = url.parse(request.url, true)
+  if request.method == 'GET'
+    filename = querystring.unescape(urlParts.pathname.substring(1))
+    gs = new mongodb.GridStore(db.mongoDb, filename, 'r', {})
+    gs.open((err, gs) ->
+      if err
+        response.writeHead(404)
+        response.end()
+        return
+      stream = gs.stream(true)
+      response.writeHead(200, {'Content-Type' : 'application/octet-stream', 'Content-Length' : gs.length})
+      stream.pipe(response)
+    )
+  else
+    response.writeHead(405, {'Allow': 'GET'})
+    response.end('405 Method Not Allowed')
 
-if cluster.isMaster
-  cluster.on('listening', (worker, address) ->
-    util.log("Worker #{worker.process.pid} listening to #{address.address}:#{address.port}")
-  )
 
-  cluster.on('exit', (worker, code, signal) ->
-    util.log("Worker #{worker.process.pid} died (#{worker.process.exitCode})")
-    setTimeout(()->
-      cluster.fork()
-    , config.WORKER_RESPAWN_TIME)
-  )
-
-  for i in [1 .. numCPUs]
-    cluster.fork()
-else
-  server = http.createServer((request, response) ->
-    urlParts = url.parse(request.url, true)
-    if request.method == 'GET'
-      filename = querystring.unescape(urlParts.pathname.substring(1))
-      gs = new mongodb.GridStore(db, filename, 'r', {})
-      gs.open((err, gs) ->
-        if err
-          response.writeHead(404)
-          response.end()
-          return
-        stream = gs.stream(true)
-        response.writeHead(200, {'Content-Type' : 'application/octet-stream', 'Content-Length' : gs.length})
-        stream.pipe(response)
-      )
-    else
-      response.writeHead(405, {'Allow': 'GET'})
-      response.end('405 Method Not Allowed')
-  )
-
-  mongodb.MongoClient.connect("mongodb://#{config.MONGODB_SOCKET}/#{config.DATABASE_NAME}", config.MONGODB_OPTIONS, (err, _db) ->
-    throw err if err
-    db = _db
-    server.listen config.FILES_PORT, config.FILES_INTERFACE
-  )
+exports.listener = listener