Skip to content

Commit 9015ac5

Browse files
authored
Merge pull request #65 from achambers/fix-read-config-bug
Fix readConfig bug
2 parents 4ea4756 + c9aa901 commit 9015ac5

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

index.js

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,20 @@ module.exports = {
4949
revisionKey: function(context) {
5050
return context.commandOptions.revision || (context.revisionData && context.revisionData.revisionKey);
5151
},
52-
redisDeployClient: function(context) {
52+
redisDeployClient: function(context, pluginHelper) {
5353
var redisLib = context._redisLib;
54-
var redisOptions = this.pluginConfig;
55-
redisOptions.port = this.readConfig('port');
56-
redisOptions.activationSuffix = this.readConfig('activationSuffix');
54+
var options = {
55+
url: pluginHelper.readConfig('url'),
56+
host: pluginHelper.readConfig('host'),
57+
port: pluginHelper.readConfig('port'),
58+
password: pluginHelper.readConfig('password'),
59+
database: pluginHelper.readConfig('database'),
60+
maxRecentUploads: pluginHelper.readConfig('maxRecentUploads'),
61+
allowOverwrite: pluginHelper.readConfig('allowOverwrite'),
62+
activationSuffix: pluginHelper.readConfig('activationSuffix')
63+
};
5764

58-
return new Redis(redisOptions, redisLib);
65+
return new Redis(options, redisLib);
5966
},
6067

6168
revisionData: function(context) {

lib/redis.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var Promise = require('ember-cli/lib/ext/promise');
44
module.exports = CoreObject.extend({
55

66
init: function(options, lib) {
7-
var redisOptions = options;
7+
var redisOptions = {};
88
var redisLib = lib;
99

1010
if (options.url) {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"chalk": "^1.0.0",
4949
"core-object": "^1.1.0",
5050
"ember-cli-babel": "^5.0.0",
51-
"ember-cli-deploy-plugin": "^0.2.1",
51+
"ember-cli-deploy-plugin": "^0.2.9",
5252
"redis": "^0.12.1",
5353
"rsvp": "^3.0.18",
5454
"then-redis": "^1.3.0"

0 commit comments

Comments
 (0)