Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Registry start log fix #461

Merged
merged 3 commits into from
Apr 11, 2017
Merged

Registry start log fix #461

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb974ef
Registry start log fix
matteofigus Apr 11, 2017
8e20da6
Remove unused dep
matteofigus Apr 11, 2017
fad5dd2
lint
matteofigus Apr 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 20 additions & 21 deletions src/registry/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
const async = require('async');
const colors = require('colors/safe');
const express = require('express');
const format = require('stringformat');
const http = require('http');
const _ = require('underscore');

Expand All @@ -18,8 +17,7 @@ const validator = require('./domain/validators');

module.exports = function(options){

let repository,
server;
let repository, server;

const self = this,
validationResult = validator.validateRegistryConfiguration(options),
Expand All @@ -45,30 +43,31 @@ module.exports = function(options){
repository = new Repository(options);
};

this.register = function(plugin, cb){
plugins.push(_.extend(plugin, { callback: cb }));
this.register = function(plugin, callback){
plugins.push(_.extend(plugin, { callback }));
};

this.start = function(callback){

const ok = msg => console.log(colors.green(msg));

if(!_.isFunction(callback)){
callback = _.noop;
}

router.create(this.app, options, repository);

async.waterfall([
function(cb){
pluginsInitialiser.init(plugins, cb);
},
function(plugins, cb){

cb => pluginsInitialiser.init(plugins, cb),

(plugins, cb) => {
options.plugins = plugins;
repository.init(cb);
},
function(componentsInfo, cb){
appStart(repository, options, (err) => {
cb(err ? err.msg : null, componentsInfo);
});

(componentsInfo, cb) => {
appStart(repository, options, (err) => cb(err ? err.msg : null, componentsInfo));
}
],
(err, componentsInfo) => {
Expand All @@ -84,23 +83,23 @@ module.exports = function(options){

if(options.verbosity){

console.log(format(colors.green('Registry started at port {0}'), self.app.get('port')));
ok(`Registry started at port ${self.app.get('port')}`);

if(_.isObject(componentsInfo)){

const componentsNumber = _.keys(componentsInfo.components).length,
componentsReleases = _.reduce(componentsInfo.components, (memo, component) => (parseInt(memo, 10) + component.length));
const componentsNumber = _.keys(componentsInfo.components).length;
const componentsReleases = _.reduce(componentsInfo.components, (memo, component) => (parseInt(memo, 10) + component.length));

console.log(format(colors.green('Registry serving {0} components for a total of {1} releases.', componentsNumber, componentsReleases)));
ok(`Registry serving ${componentsNumber} components for a total of ${componentsReleases} releases.`);
}
}

callback(null, { app: self.app, server: server });
callback(null, { app: self.app, server });
});

server.on('error', (e) => {
eventsHandler.fire('error', { code: 'EXPRESS_ERROR', message: e });
callback(e);
server.on('error', (message) => {
eventsHandler.fire('error', { code: 'EXPRESS_ERROR', message });
callback(message);
});
});
};
Expand Down