Fixed up --verbose comand line option again.

matthiasthomas · Oct 2, 2013 · c02ba53 · c02ba53
1 parent 6ef149a
commit c02ba53
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/lib/app/load.js b/lib/app/load.js
@@ -28,6 +28,7 @@ module.exports = function (sails) {
 
 	return function load (configOverride, cb) {
 
+
 		// Provide access to module loader from the Sails object
 		sails.modules = Modules;
 
@@ -42,9 +43,9 @@ module.exports = function (sails) {
 		configOverride = configOverride || {};
 
 		// Environment variables should override other config
-		configOverride.environment = process.env.NODE_ENV;
+		configOverride.environment = process.env.NODE_ENV || "development";
 		configOverride.port = process.env.PORT || configOverride.port;
-		sails.config = util.clone(configOverride);
+		sails.config = util.cloneDeep(configOverride);
 
 		async.auto({
 

diff --git a/lib/configuration/load.js b/lib/configuration/load.js
@@ -43,11 +43,15 @@ module.exports = function (sails) {
 			 */
 			mapOverrides: function (cb) {
 
+				// TODO: move this into `lib/app/load` instead
+
 				// Take the overrides + app path
 				// and clone and save them for later
 				var overrides = util.cloneDeep(sails.config);
 
 				// Map command line shortcut options to proper configuration
+				// Only needs to be done for command-line or ENV overrides 
+				// which do not match their configuration file equivalents
 				if (sails.config.dev && sails.config.prod) {
 					var err = new Error ('You cannot specify both production AND development!');
 					sails.log.error(err);
@@ -59,6 +63,9 @@ module.exports = function (sails) {
 				if (overrides.prod) {
 					overrides.environment = 'production';
 				}
+				if (overrides.verbose) {
+					overrides.log = { level: 'verbose' };
+				}
 
 				// Pass on overrides object
 				cb(null, overrides);

diff --git a/lib/index.js b/lib/index.js
@@ -1,3 +1,5 @@
 var Sails = require('./app');
 
+// Instantiate a Sails by default
+// (maintains legacy support)
 module.exports = new Sails();