ff-attic/node-ff-assets
2
0
Fork 0
Code Activity

switch to debug lib

Browse source
This commit is contained in:
Willem 2015-06-28 16:41:57 +02:00
parent 059c4a72a0
commit 7217f8617a
7 changed files with 106 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/asset-assembler.js
View file

@ -1,5 +1,6 @@
'use strict';
var debug = require('debug')('ff:assets:asset-assembler');
var u = require('underscore');
var events = require('events');
var fetch = require('fetch');
@ -26,10 +27,10 @@ function buildEnd(assembler, targetFile, resultUriList, callback) {
resultUriList = [assembler.config.linkTarget];
}
assembler.emit('file-write-post',targetFile);
assembler.emit('log','debug','target file: '+targetFile);
assembler.emit('log','debug','target size: '+targetSize);
assembler.emit('log','info','build result size: '+resultUriList.length+' from: '+buildResultSize);
assembler.emit('log','info','build done in: '+buildTime+' ms.');
debug('target file: %s',targetFile);
debug('target size: %s',targetSize);
assembler.emit('log','build result size: '+resultUriList.length+' from: '+buildResultSize);
assembler.emit('log','build done in: '+buildTime+' ms.');
assembler.emit('result',resultUriList);
assembler.emit('end');
callback();
@ -40,7 +41,7 @@ function buildEnd(assembler, targetFile, resultUriList, callback) {
function downloadFile(assembler, remoteUrl, localFile, callback) {
assembler.emit('file-download-pre',remoteUrl);
assembler.emit('log','debug','downloadFile: '+remoteUrl);
debug('downloadFile: %s',remoteUrl);
fs.ensureFile(localFile, function(err) {
if (err) {
callback(err);
@ -101,7 +102,7 @@ function aggregateFileList(assembler, targetFile, aggregateList, readFile, callb
callback(err);
} else {
assembler.emit('file-read-post',aggregateFile);
assembler.emit('log','debug','readFile: '+aggregateFile+' size: '+data.length);
debug('readFile: '+aggregateFile+' size: '+data.length);
if (assembler.config.assetSeperator !== null && assembler.config.assetSeperator.length > 0) {
var seperatorTemplate = u.template(assembler.config.assetSeperator);
data = seperatorTemplate({file: aggregateFile}) + data;
@ -175,8 +176,8 @@ function buildAsset(assembler, targetFile, readFile, callback) {
downloadList.reverse();
readFileList.reverse();
assembler.emit('log','debug','downloadList size: '+downloadList.length);
assembler.emit('log','debug','readFileList size: '+readFileList.length);
debug('downloadList size: %s',downloadList.length);
debug('readFileList size: %s',readFileList.length);
downloadFileList(assembler, downloadList, function(err) {
if (err) {
@ -201,9 +202,9 @@ function buildAsset(assembler, targetFile, readFile, callback) {
function buildStart(assembler, readFile, callback) {
assembler.startTime = new Date().getTime();
assembler.emit('begin');
assembler.emit('log','info','build begin for: '+assembler.config.linkTarget);
assembler.emit('log','build begin for: '+assembler.config.linkTarget);
if (assembler.config.downloadForce) {
assembler.emit('log','info','build using forced downloads.');
assembler.emit('log','build using forced downloads.');
}
var targetFile = mapLocalFileSync(assembler, assembler.config.linkTarget);
fs.ensureFile(targetFile, function (err) {

40
lib/assets-builder.js
View file

@ -1,17 +1,20 @@
'use strict';
var events = require('events');
var debug = require('debug')('ff:assets:assets-builder');
var async = require('async');
var config = require('./assets-builder-config');
function buildStepAssemblerRun(builder, buildConfig, assembler, callback) {
builder.emit('log','debug','runAssembler '+assembler.config.assetType);
debug('runAssembler type: %s',assembler.config.assetType);
assembler.run(callback);
}
function buildStepAssemblerFill(builder, buildConfig, assembler, callback) {
var assemblerFill = buildConfig.assemblerFill || builder.config.assemblerFill;
builder.emit('log','debug','assemblerFill: '+Object.keys(assemblerFill));
var assemblerFill = buildConfig.assemblerFill;
if (assemblerFill === undefined) {
assemblerFill = builder.config.assemblerFill;
debug('assemblerFill from default');
}
assemblerFill(assembler, function(err) {
if (err) {
callback(err);
@ -22,8 +25,11 @@ function buildStepAssemblerFill(builder, buildConfig, assembler, callback) {
}
function buildStepAssemblerCreate(builder, buildConfig, assemblerConfig, callback) {
var assemblerCreate = buildConfig.assemblerCreate || builder.config.assemblerCreate;
builder.emit('log','debug','assemblerCreate: '+Object.keys(assemblerCreate));
var assemblerCreate = buildConfig.assemblerCreate;
if (assemblerCreate === undefined) {
assemblerCreate = builder.config.assemblerCreate;
debug('assemblerCreate from default');
}
assemblerCreate(assemblerConfig, function(err, assembler) {
if (err) {
callback(err);
@ -34,12 +40,14 @@ function buildStepAssemblerCreate(builder, buildConfig, assemblerConfig, callbac
}
function buildStepConfigFill(builder, buildConfig, assemblerConfig, callback) {
var configFill = buildConfig.configFill || builder.config.configFill;
var configFill = buildConfig.configFill;
if (configFill === undefined) {
configFill = builder.config.configFill;
debug('configFill from default');
}
if (assemblerConfig.assetType === undefined) {
assemblerConfig.assetType = builder.currentAssetType;
}
builder.emit('log','debug','configFill: '+Object.keys(configFill));
configFill(assemblerConfig, function(err) {
if (err) {
callback(err);
@ -50,8 +58,11 @@ function buildStepConfigFill(builder, buildConfig, assemblerConfig, callback) {
}
function buildStepConfigCreate(builder, buildConfig, callback) {
var configCreate = buildConfig.configCreate || builder.config.configCreate;
builder.emit('log','debug','configCreate: '+Object.keys(configCreate));
var configCreate = buildConfig.configCreate;
if (configCreate === undefined) {
configCreate = builder.config.configCreate;
debug('configCreate from default');
}
configCreate(function(err, assemblerConfig) {
if (err) {
callback(err);
@ -68,14 +79,11 @@ function AssetsBuilder(config) {
this.config = config;
this.startTime = 0;
this.currentAssetType = '';
events.EventEmitter.call(this);
}
AssetsBuilder.prototype.__proto__ = events.EventEmitter.prototype;
AssetsBuilder.prototype.runAll = function(callback) {
var self = this;
self.emit('log','debug','runAll started.');
debug('runAll started.');
config.checkConfig(self.config,function(err) {
if (err) {
callback(err);
@ -101,7 +109,7 @@ AssetsBuilder.prototype.runAsset = function(name) {
if (name === undefined) {
throw new Error('no name');
}
self.emit('log','debug','runAsset started for: '+name);
debug('runAsset started for: %s',name);
return function(callback) {
if (callback === undefined) {
throw new Error('no callback');

8
lib/factory.js
View file

@ -69,8 +69,8 @@ var assemblerEventLog = {
if (logType === undefined) {
throw new Error('no logType');
}
return function(logLevel, logMessage) {
console.log(logLevel + ': node-ff-assets-' + logType + ' ' + logMessage);
return function(logMessage) {
console.log('node-ff-assets:' + logType + ' ' + logMessage);
};
},
winston: function(logger, logType) {
@ -80,8 +80,8 @@ var assemblerEventLog = {
if (logType === undefined) {
throw new Error('no logType');
}
return function(logLevel, logMessage) {
logger.log(logLevel, 'node-ff-assets-'+logType+' '+logMessage);
return function(logMessage) {
logger.log('node-ff-assets:'+logType+' '+logMessage);
};
},
};