From 5a92f3eeb1f67f62b0375f45ea25757d63100122 Mon Sep 17 00:00:00 2001 From: Raymond Feng Date: Fri, 13 May 2016 08:41:49 -0700 Subject: [PATCH] Rebase from master --- lib/bootstrapper.js | 5 +++++ lib/plugin-base.js | 5 +++++ lib/plugin-loader.js | 5 +++++ lib/plugins/application.js | 5 +++++ lib/plugins/boot-script.js | 5 +++++ lib/plugins/component.js | 5 +++++ lib/plugins/datasource.js | 10 ++++++++++ lib/plugins/middleware.js | 5 +++++ lib/plugins/mixin.js | 5 +++++ lib/plugins/model.js | 5 +++++ lib/plugins/swagger.js | 5 +++++ lib/utils.js | 2 -- package.json | 2 +- 13 files changed, 61 insertions(+), 3 deletions(-) diff --git a/lib/bootstrapper.js b/lib/bootstrapper.js index cc5f200..1ac91da 100644 --- a/lib/bootstrapper.js +++ b/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'); diff --git a/lib/plugin-base.js b/lib/plugin-base.js index 96e7c4c..05ea50f 100644 --- a/lib/plugin-base.js +++ b/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'); diff --git a/lib/plugin-loader.js b/lib/plugin-loader.js index c093e96..227fd8e 100644 --- a/lib/plugin-loader.js +++ b/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'); diff --git a/lib/plugins/application.js b/lib/plugins/application.js index d500bfd..47b34fb 100644 --- a/lib/plugins/application.js +++ b/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'); diff --git a/lib/plugins/boot-script.js b/lib/plugins/boot-script.js index 90406ab..898d5c3 100644 --- a/lib/plugins/boot-script.js +++ b/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'); diff --git a/lib/plugins/component.js b/lib/plugins/component.js index 90c193a..41c2339 100644 --- a/lib/plugins/component.js +++ b/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'); diff --git a/lib/plugins/datasource.js b/lib/plugins/datasource.js index 80ff82e..f99a6dc 100644 --- a/lib/plugins/datasource.js +++ b/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); }); }; diff --git a/lib/plugins/middleware.js b/lib/plugins/middleware.js index faea629..ab15e12 100644 --- a/lib/plugins/middleware.js +++ b/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'); diff --git a/lib/plugins/mixin.js b/lib/plugins/mixin.js index 8f17b43..5fe7fa6 100644 --- a/lib/plugins/mixin.js +++ b/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'); diff --git a/lib/plugins/model.js b/lib/plugins/model.js index 064450a..f9c249a 100644 --- a/lib/plugins/model.js +++ b/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'); diff --git a/lib/plugins/swagger.js b/lib/plugins/swagger.js index 84424c3..24770d0 100644 --- a/lib/plugins/swagger.js +++ b/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'); diff --git a/lib/utils.js b/lib/utils.js index 87fc3ef..c9d1e89 100644 --- a/lib/utils.js +++ b/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'); diff --git a/package.json b/package.json index 0048937..0ba7747 100644 --- a/package.json +++ b/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",