UPDATE: simplify http server listener handling

Author: Jon-Biz

server/index.js

@@ -61,23 +61,9 @@ class Server extends EventEmitter {
     this.peersCacheLength = peersCacheLength
     this.peersCacheTtl = peersCacheTtl
 
-    if (opts.http !== false) attachHttpService(this, onListening)
-    if (opts.ws !== false) attachWSService(this, onListening)
-    if (opts.stats !== false) setupStatsRoute(this, onListening)
-
-    // TODO: UGH
-    let num = !!this.http
-    this.num = num
-
-    const self = this
-    function onListening () {
-      num -= 1
-      if (num === 0) {
-        self.listening = true
-        debug('listening')
-        self.emit('listening')
-      }
-    }
+    if (opts.http !== false) attachHttpService(this)
+    if (opts.ws !== false) attachWSService(this)
+    if (opts.stats !== false) setupStatsRoute(this)
   }
 
   onError (err) {

server/services/attachHttp/index.js

@@ -1,16 +1,23 @@
+const debug = require('debug')('bittorrent-tracker:server')
+
 const http = require('http')
 const bencode = require('bencode')
 
 const common = require('../../../lib/common')
 const parseHttpRequest = require('./parseHttpRequest')
 
-function attachHttpServer (server, onListening) {
-  const {
-    onError
-  } = server
-
+function attachHttpServer (server) {
   const httpServer = http.createServer()
 
+  const onListening = () => {
+    server.listening = true
+    debug('listening')
+    server.emit('listening')
+  }
+
+  const onError = (...args) => { server.onError(...args)}
+
+
   httpServer.on('error', onError)
   httpServer.on('listening', onListening)