Rebase from master

lib/bootstrapper.js

@@ -1,3 +1,8 @@
+// Copyright IBM Corp. 2014,2016. All Rights Reserved.
+// Node module: loopback-boot
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
 var assert = require('assert');
 var async = require('async');
 var utils = require('./utils');

lib/plugin-base.js

@@ -1,3 +1,8 @@
+// Copyright IBM Corp. 2014,2016. All Rights Reserved.
+// Node module: loopback-boot
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
 var fs = require('fs');
 var path = require('path');
 var debug = require('debug')('loopback:boot:plugin');

lib/plugin-loader.js

@@ -1,3 +1,8 @@
+// Copyright IBM Corp. 2014,2016. All Rights Reserved.
+// Node module: loopback-boot
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
 var util = require('util');
 var utils = require('./utils');
 var path = require('path');

lib/plugins/application.js

@@ -1,3 +1,8 @@
+// Copyright IBM Corp. 2014,2016. All Rights Reserved.
+// Node module: loopback-boot
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
 var util = require('util');
 var assert = require('assert');
 var semver = require('semver');

lib/plugins/boot-script.js

@@ -1,3 +1,8 @@
+// Copyright IBM Corp. 2014,2016. All Rights Reserved.
+// Node module: loopback-boot
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
 var util = require('util');
 var utils = require('../utils');
 var path = require('path');

lib/plugins/component.js

@@ -1,3 +1,8 @@
+// Copyright IBM Corp. 2014,2016. All Rights Reserved.
+// Node module: loopback-boot
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
 var util = require('util');
 var debug = require('debug')('loopback:boot:component');
 var PluginBase = require('../plugin-base');

lib/plugins/datasource.js

@@ -1,3 +1,8 @@
+// Copyright IBM Corp. 2014,2016. All Rights Reserved.
+// Node module: loopback-boot
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
 var util = require('util');
 var utils = require('../utils');
 var PluginBase = require('../plugin-base');
@@ -20,9 +25,14 @@ DataSource.prototype.getRootDir = function() {
 DataSource.prototype.start = function(context) {
   var app = context.app;
   var self = this;
+  var lazyConnect = process.env.LB_LAZYCONNECT_DATASOURCES;
   utils.forEachKeyedObject(context.instructions[this.name], function(key, obj) {
     obj = self.getUpdatedConfigObject(context, obj, { useEnvVars: true });
     debug('Registering data source %s %j', key, obj);
+    if (lazyConnect) {
+      obj.lazyConnect =
+        lazyConnect === 'false' || lazyConnect === '0' ? false : true;
+    }
     app.dataSource(key, obj);
   });
 };

lib/plugins/middleware.js

@@ -1,3 +1,8 @@
+// Copyright IBM Corp. 2014,2016. All Rights Reserved.
+// Node module: loopback-boot
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
 var util = require('util');
 var assert = require('assert');
 var path = require('path');

lib/plugins/mixin.js

@@ -1,3 +1,8 @@
+// Copyright IBM Corp. 2014,2016. All Rights Reserved.
+// Node module: loopback-boot
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
 var util = require('util');
 var fs = require('fs');
 var path = require('path');

lib/plugins/model.js

@@ -1,3 +1,8 @@
+// Copyright IBM Corp. 2014,2016. All Rights Reserved.
+// Node module: loopback-boot
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
 var assert = require('assert');
 var util = require('util');
 var PluginBase = require('../plugin-base');

lib/plugins/swagger.js

@@ -1,3 +1,8 @@
+// Copyright IBM Corp. 2014,2016. All Rights Reserved.
+// Node module: loopback-boot
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
 var util = require('util');
 var PluginBase = require('../plugin-base');
 

lib/utils.js

@@ -3,8 +3,6 @@
 // This file is licensed under the MIT License.
 // License text available at https://opensource.org/licenses/MIT
 
-var fs = require('fs');
-
 var debug = require('debug')('loopback:boot');
 var path = require('path');
 var Module = require('module');

package.json

@@ -24,7 +24,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "async": "^0.9.2",
+    "async": "^1.5.2",
     "bluebird": "^3.3.5",
     "commondir": "1.0.1",
     "debug": "^2.2.0",