Move some files around

server.js

@@ -1,11 +1,11 @@
 const http = require('http')
 const throng = require('throng')
-const createApp = require('./server/createApp')
+const createServer = require('./server/createServer')
 
 const port = parseInt(process.env.PORT, 10) || 5000
 
 function startServer(id) {
-  const server = http.createServer(createApp())
+  const server = http.createServer(createServer())
 
   // Heroku dynos automatically timeout after 30s. Set our
   // own timeout here to force sockets to close before that.

server/createServer.js

@@ -8,9 +8,9 @@ const checkBlacklist = require('./middleware/checkBlacklist')
 const packageURL = require('./middleware/packageURL')
 const fetchFile = require('./middleware/fetchFile')
 const serveFile = require('./middleware/serveFile')
-const serveStats = require('./middleware/serveStats')
 
 const createSearchServer = require('./createSearchServer')
+const createStatsServer = require('./createStatsServer')
 
 morgan.token('fwd', function (req) {
   return req.get('x-forwarded-for').replace(/\s/g, '')
@@ -48,9 +48,8 @@ function createApp() {
     maxAge: '365d'
   }))
 
-  app.use('/_stats', serveStats())
-
   app.use('/_search', createSearchServer())
+  app.use('/_stats', createStatsServer())
 
   app.use('/',
     packageURL,

server/createServer.test.js

@@ -1,10 +1,10 @@
 const request = require('supertest')
-const createApp = require('./createApp')
+const createServer = require('./createServer')
 
 describe('The server app', function () {
   let app
   beforeEach(function () {
-    app = createApp()
+    app = createServer()
   })
 
   it('rejects invalid package names', function (done) {

server/createStatsServer.js

@@ -2,7 +2,7 @@ const express = require('express')
 const subDays = require('date-fns/sub_days')
 const startOfDay = require('date-fns/start_of_day')
 const startOfSecond = require('date-fns/start_of_second')
-const StatsServer = require('../StatsServer')
+const StatsServer = require('./StatsServer')
 
 function serveArbitraryStats(req, res) {
   const now = startOfSecond(new Date)
@@ -63,7 +63,7 @@ function serveLastDayStats(req, res) {
   servePastDaysStats(1, req, res)
 }
 
-function serveStats() {
+function createStatsServer() {
   const app = express.Router()
 
   app.get('/', serveArbitraryStats)
@@ -74,4 +74,4 @@ function serveStats() {
   return app
 }
 
-module.exports = serveStats
+module.exports = createStatsServer