jenkins-bot has submitted this change and it was merged.
Change subject: Updating prfun library
......................................................................
Updating prfun library
Change-Id: Ide1093accdc20ee57b39501d15fca3d08c6ed052
---
M lib/RedisWrapper.js
M lib/threads/frontend.js
M package.json
3 files changed, 9 insertions(+), 9 deletions(-)
Approvals:
Mwalker: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/RedisWrapper.js b/lib/RedisWrapper.js
index e9c336b..3e06a40 100644
--- a/lib/RedisWrapper.js
+++ b/lib/RedisWrapper.js
@@ -108,25 +108,25 @@
// --- Redis Client Commands ---
RedisWrapper.prototype.watch = function( key ) {
- return Promise.promisify( this.client.watch, this.client )( key );
+ return Promise.promisify( this.client.watch, false, this.client )( key
);
};
RedisWrapper.prototype.multi = function() {
return this.client.multi();
};
RedisWrapper.prototype.blpop = function( key, timeout ) {
- return Promise.promisify( this.client.blpop, this.client )( key,
timeout );
+ return Promise.promisify( this.client.blpop, false, this.client )( key,
timeout );
};
RedisWrapper.prototype.hset = function( hash, key, value ) {
- return Promise.promisify( this.client.hset, this.client )( hash, key,
value );
+ return Promise.promisify( this.client.hset, false, this.client )( hash,
key, value );
};
RedisWrapper.prototype.hget = function( hash, key ) {
- return Promise.promisify( this.client.hget, this.client )( hash, key );
+ return Promise.promisify( this.client.hget, false, this.client )( hash,
key );
};
RedisWrapper.prototype.llen = function( key ) {
- return Promise.promisify( this.client.llen, this.client )( key );
+ return Promise.promisify( this.client.llen, false, this.client )( key );
};
RedisWrapper.prototype.hlen = function( key ) {
- return Promise.promisify( this.client.hlen, this.client )( key );
+ return Promise.promisify( this.client.hlen, false, this.client )( key );
};
module.exports = RedisWrapper;
diff --git a/lib/threads/frontend.js b/lib/threads/frontend.js
index ac7052d..3bc6362 100644
--- a/lib/threads/frontend.js
+++ b/lib/threads/frontend.js
@@ -412,7 +412,7 @@
writer
).toJson()
);
- return Promise.promisify( multi.exec, multi )().catch(
function( err ) {
+ return Promise.promisify( multi.exec, false, multi
)().catch( function( err ) {
console.error(
'Job insertion into redis failed for
job %s with error: %s',
collectionId,
diff --git a/package.json b/package.json
index acde7f8..65c7796 100644
--- a/package.json
+++ b/package.json
@@ -22,9 +22,9 @@
"async": "~0.2.9",
"busboy": "0.0.12",
"commander": "~2.2.0",
- "es6-shim": "~0.12.0",
+ "es6-shim": "~0.13.0",
"mime": "~1.2.11",
- "prfun": "~0.1.0",
+ "prfun": "~1.0.0",
"redis": "~0.9.0",
"winston": "~0.7.3",
"sprintf-js": "0.0.7"
--
To view, visit https://gerrit.wikimedia.org/r/146646
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ide1093accdc20ee57b39501d15fca3d08c6ed052
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator
Gerrit-Branch: master
Gerrit-Owner: Mwalker <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
