beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:whitef0x0/tellform

Browse source
This commit is contained in:
David Baldwynn 2017-07-20 20:09:49 -04:00
parent 70f22dcb0b 741068e756
commit 792933d760
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/logger.js
View file

@ -76,7 +76,7 @@ logger.getLogOptions = function getLogOptions() {
var _config = _.clone(config, true); var _config = _.clone(config, true);
var configFileLogger = _config.log.fileLogger; var configFileLogger = _config.log.fileLogger;
if (!_config.log.fileLogger.hasOwnProperty('directoryPath') || !_config.log.fileLogger.hasOwnProperty('fileName')) { if (!_.has(_config, 'log.fileLogger.directoryPath') || !_.has(_config, 'log.fileLogger.fileName')) {
console.log('unable to find logging file configuration'); console.log('unable to find logging file configuration');
return false; return false;
} }

2
gruntfile.js
View file

@ -332,8 +332,6 @@ module.exports = function(grunt) {
grunt.task.registerTask('loadConfig', 'Task that loads the config into a grunt option.', function() { grunt.task.registerTask('loadConfig', 'Task that loads the config into a grunt option.', function() {
require('./config/init')(); require('./config/init')();
var config = require('./config/config'); var config = require('./config/config');
console.log(config);
grunt.config.set('applicationJavaScriptFiles', config.assets.js); grunt.config.set('applicationJavaScriptFiles', config.assets.js);
grunt.config.set('formApplicationJavaScriptFiles', config.assets.form_js); grunt.config.set('formApplicationJavaScriptFiles', config.assets.form_js);
grunt.config.set('applicationCSSFiles', config.assets.css); grunt.config.set('applicationCSSFiles', config.assets.css);