Fix paths

index.js

@@ -38,7 +38,7 @@ if (cluster.isMaster) {
     setTimeout(() => cluster.fork(), 5000);
   });
 } else {
-  require('./src/worker');
+  require('./src/app');
 }
 
 //

src/app.js

@@ -26,10 +26,10 @@ const openpgp = require('openpgp');
 const nodemailer = require('nodemailer');
 const Mongo = require('./dao/mongo');
 const Email = require('./dao/email');
-const UserId = require('./ctrl/user-id');
-const PublicKey = require('./ctrl/public-key');
-const HKP = require('./routes/hkp');
-const REST = require('./routes/rest');
+const UserId = require('./service/user-id');
+const PublicKey = require('./service/public-key');
+const HKP = require('./route/hkp');
+const REST = require('./route/rest');
 
 let mongo, email, userId, publicKey, hkp, rest;
 

src/route/hkp.js

@@ -18,7 +18,7 @@
 'use strict';
 
 const parse = require('co-body');
-const util = require('../ctrl/util');
+const util = require('../service/util');
 
 /**
  * An implementation of the OpenPGP HTTP Keyserver Protocol (HKP)

src/route/rest.js

@@ -18,7 +18,7 @@
 'use strict';
 
 const parse = require('co-body');
-const util = require('../ctrl/util');
+const util = require('../service/util');
 
 /**
  * The REST api to provide additional functionality on top of HKP

src/service/public-key.js

@@ -30,16 +30,16 @@ const util = require('./util');
 const DB_TYPE = 'publickey';
 
 /**
- * A controller that handlers PGP public keys queries to the database
+ * A service that handlers PGP public keys queries to the database
  */
 class PublicKey {
 
   /**
-   * Create an instance of the controller
+   * Create an instance of the service
    * @param {Object} openpgp   An instance of OpenPGP.js
    * @param {Object} mongo     An instance of the MongoDB client
    * @param {Object} email     An instance of the Email Sender
-   * @param {Object} userid    An instance of the UserId controller
+   * @param {Object} userid    An instance of the UserId service
    */
   constructor(openpgp, mongo, email, userid) {
     this._openpgp = openpgp;

src/service/user-id.js

@@ -31,12 +31,12 @@
 const DB_TYPE = 'userid';
 
 /**
- * A controller that handles User ID queries to the database
+ * A service that handles User ID queries to the database
  */
 class UserId {
 
   /**
-   * Create an instance of the controller
+   * Create an instance of the service
    * @param {Object} mongo   An instance of the MongoDB client
    */
   constructor(mongo) {

test/integration/app-test.js

@@ -5,7 +5,7 @@ require('co-mocha')(require('mocha')); // monkey patch mocha for generators
 const request = require('supertest');
 const fs = require('fs');
 
-describe.skip('Koa HTTP Server (worker) Integration Tests', function() {
+describe.skip('Koa App (HTTP Server) Integration Tests', function() {
   this.timeout(20000);
 
   let app, pgpKey1;
@@ -13,7 +13,7 @@ describe.skip('Koa HTTP Server (worker) Integration Tests', function() {
   before(function *() {
     pgpKey1 = fs.readFileSync(__dirname + '/../key1.asc', 'utf8');
     global.testing = true;
-    let init = require('../../src/worker');
+    let init = require('../../src/app');
     app = yield init();
   });