aux/keyserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix paths

Browse Source
This commit is contained in:
Tankred Hase 2016-05-28 15:17:46 +02:00
parent 2f789eeb42
commit 0d2eba47ec
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.js
View File

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

8
src/app.js
View File

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

2
src/route/hkp.js
View File

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

2
src/route/rest.js
View File

@ -18,7 +18,7 @@
'use strict'; 'use strict';
const parse = require('co-body'); 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 * The REST api to provide additional functionality on top of HKP

6
src/service/public-key.js
View File

@ -30,16 +30,16 @@ const util = require('./util');
const DB_TYPE = 'publickey'; 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 { class PublicKey {
/** /**
* Create an instance of the controller * Create an instance of the service
* @param {Object} openpgp An instance of OpenPGP.js * @param {Object} openpgp An instance of OpenPGP.js
* @param {Object} mongo An instance of the MongoDB client * @param {Object} mongo An instance of the MongoDB client
* @param {Object} email An instance of the Email Sender * @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) { constructor(openpgp, mongo, email, userid) {
this._openpgp = openpgp; this._openpgp = openpgp;

4
src/service/user-id.js
View File

@ -31,12 +31,12 @@
const DB_TYPE = 'userid'; 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 { class UserId {
/** /**
* Create an instance of the controller * Create an instance of the service
* @param {Object} mongo An instance of the MongoDB client * @param {Object} mongo An instance of the MongoDB client
*/ */
constructor(mongo) { constructor(mongo) {

4
test/integration/app-test.js
View File

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