Mobrovac has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326951 )
Change subject: Update restbase to 39d3478 ...................................................................... Update restbase to 39d3478 List of changes: 15bb2da Implemented a WIP trending endpoint bc0837b Updated to the latest trending schema 8ffe506 Fixed linting errors and tests 51d4dbd Set the actual trending URI 6ffa158 Added tests for trending endpoint 5c4ea19 Removed date component and storage for trending edits a147743 Increased trending cache-control and separated enwiki 0b91c10 Added 'editors' property ab3f34d Resurrect announcements on domains other then en.wiki since we don't know how would it behave 39d3478 Release v0.16.2 xxxxxxx Update node module dependencies Change-Id: Ie05fef27c49a9476225f4241e23d4b87ccb35524 --- M node_modules/content-type/package.json M node_modules/heapdump/build/Makefile M node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d M node_modules/heapdump/build/addon.target.mk M node_modules/heapdump/build/config.gypi M node_modules/hyperswitch/node_modules/json-stable-stringify/package.json D node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/COPYING.txt A node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/LICENSE M node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.d.ts M node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/package.json M node_modules/hyperswitch/node_modules/swagger-ui/package.json M node_modules/json-stable-stringify/package.json M node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json M node_modules/service-runner/lib/logger.js M node_modules/service-runner/lib/master.js M node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json M node_modules/service-runner/package.json M restbase 18 files changed, 126 insertions(+), 91 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/51/326951/1 diff --git a/node_modules/content-type/package.json b/node_modules/content-type/package.json index ca63b83..10689db 100644 --- a/node_modules/content-type/package.json +++ b/node_modules/content-type/package.json @@ -44,7 +44,7 @@ }, "homepage": "https://github.com/jshttp/content-type#readme";, "_id": "content-type@1.0.1", - "_shasum": "387ae43872e37959fa3a73ec62d7b84f5a212703", + "_shasum": "41eb82f0aea6308e6d64ce4c5c8f4f4461fd33c2", "_from": "git+https://github.com/wikimedia/content-type.git#master";, "_resolved": "git+https://github.com/wikimedia/content-type.git#47b2632d0a2ee79a7d67268e2f6621becd95d05b"; } diff --git a/node_modules/heapdump/build/Makefile b/node_modules/heapdump/build/Makefile index 285e8ee..c9d9d51 100644 --- a/node_modules/heapdump/build/Makefile +++ b/node_modules/heapdump/build/Makefile @@ -308,8 +308,8 @@ endif quiet_cmd_regen_makefile = ACTION Regenerating $@ -cmd_regen_makefile = cd $(srcdir); /usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/opt/service/node_modules/heapdump/build/config.gypi -I/usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/root/.node-gyp/4.6.0/include/node/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/root/.node-gyp/4.6.0" "-Dnode_gyp_dir=/usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp" "-Dnode_lib_file=node.lib" "-Dmodule_root_dir=/opt/service/node_modules/heapdump" binding.gyp -Makefile: $(srcdir)/../../../../usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/build/config.gypi $(srcdir)/binding.gyp $(srcdir)/../../../../root/.node-gyp/4.6.0/include/node/common.gypi +cmd_regen_makefile = cd $(srcdir); /usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "--toplevel-dir=." -I/opt/service/node_modules/heapdump/build/config.gypi -I/usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/home/runuser/.node-gyp/4.6.0/include/node/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/home/runuser/.node-gyp/4.6.0" "-Dnode_gyp_dir=/usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp" "-Dnode_lib_file=node.lib" "-Dmodule_root_dir=/opt/service/node_modules/heapdump" binding.gyp +Makefile: $(srcdir)/../../../../home/runuser/.node-gyp/4.6.0/include/node/common.gypi $(srcdir)/../../../../usr/local/nvm/versions/node/v4.6.0/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/build/config.gypi $(srcdir)/binding.gyp $(call do_cmd,regen_makefile) # "all" is a concatenation of the "all" targets from all the included diff --git a/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d b/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d index 022660f..9af41a7 100644 --- a/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d +++ b/node_modules/heapdump/build/Release/.deps/Release/obj.target/addon/src/heapdump.o.d @@ -1,34 +1,36 @@ -cmd_Release/obj.target/addon/src/heapdump.o := g++ '-DNODE_GYP_MODULE_NAME=addon' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/root/.node-gyp/4.6.0/include/node -I/root/.node-gyp/4.6.0/src -I/root/.node-gyp/4.6.0/deps/uv/include -I/root/.node-gyp/4.6.0/deps/v8/include -fPIC -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -ffunction-sections -fdata-sections -fno-omit-frame-pointer -fno-rtti -fno-exceptions -std=gnu++0x -MMD -MF ./Release/.deps/Release/obj.target/addon/src/heapdump.o.d.raw -c -o Release/obj.target/addon/src/heapdump.o ../src/heapdump.cc +cmd_Release/obj.target/addon/src/heapdump.o := g++ '-DNODE_GYP_MODULE_NAME=addon' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/home/runuser/.node-gyp/4.6.0/include/node -I/home/runuser/.node-gyp/4.6.0/src -I/home/runuser/.node-gyp/4.6.0/deps/uv/include -I/home/runuser/.node-gyp/4.6.0/deps/v8/include -fPIC -pthread -Wall -Wextra -Wno-unused-parameter -m64 -O3 -ffunction-sections -fdata-sections -fno-omit-frame-pointer -fno-rtti -fno-exceptions -std=gnu++0x -MMD -MF ./Release/.deps/Release/obj.target/addon/src/heapdump.o.d.raw -c -o Release/obj.target/addon/src/heapdump.o ../src/heapdump.cc Release/obj.target/addon/src/heapdump.o: ../src/heapdump.cc \ - /root/.node-gyp/4.6.0/include/node/node.h \ - /root/.node-gyp/4.6.0/include/node/v8.h \ - /root/.node-gyp/4.6.0/include/node/v8-version.h \ - /root/.node-gyp/4.6.0/include/node/v8config.h \ - /root/.node-gyp/4.6.0/include/node/node_version.h ../src/compat-inl.h \ - ../src/compat.h /root/.node-gyp/4.6.0/include/node/node_version.h \ - /root/.node-gyp/4.6.0/include/node/v8.h \ - /root/.node-gyp/4.6.0/include/node/v8-profiler.h \ - /root/.node-gyp/4.6.0/include/node/uv.h \ - /root/.node-gyp/4.6.0/include/node/uv-errno.h \ - /root/.node-gyp/4.6.0/include/node/uv-version.h \ - /root/.node-gyp/4.6.0/include/node/uv-unix.h \ - /root/.node-gyp/4.6.0/include/node/uv-threadpool.h \ - /root/.node-gyp/4.6.0/include/node/uv-linux.h ../src/heapdump-posix.h + /home/runuser/.node-gyp/4.6.0/include/node/node.h \ + /home/runuser/.node-gyp/4.6.0/include/node/v8.h \ + /home/runuser/.node-gyp/4.6.0/include/node/v8-version.h \ + /home/runuser/.node-gyp/4.6.0/include/node/v8config.h \ + /home/runuser/.node-gyp/4.6.0/include/node/node_version.h \ + ../src/compat-inl.h ../src/compat.h \ + /home/runuser/.node-gyp/4.6.0/include/node/node_version.h \ + /home/runuser/.node-gyp/4.6.0/include/node/v8.h \ + /home/runuser/.node-gyp/4.6.0/include/node/v8-profiler.h \ + /home/runuser/.node-gyp/4.6.0/include/node/uv.h \ + /home/runuser/.node-gyp/4.6.0/include/node/uv-errno.h \ + /home/runuser/.node-gyp/4.6.0/include/node/uv-version.h \ + /home/runuser/.node-gyp/4.6.0/include/node/uv-unix.h \ + /home/runuser/.node-gyp/4.6.0/include/node/uv-threadpool.h \ + /home/runuser/.node-gyp/4.6.0/include/node/uv-linux.h \ + ../src/heapdump-posix.h ../src/heapdump.cc: -/root/.node-gyp/4.6.0/include/node/node.h: -/root/.node-gyp/4.6.0/include/node/v8.h: -/root/.node-gyp/4.6.0/include/node/v8-version.h: -/root/.node-gyp/4.6.0/include/node/v8config.h: -/root/.node-gyp/4.6.0/include/node/node_version.h: +/home/runuser/.node-gyp/4.6.0/include/node/node.h: +/home/runuser/.node-gyp/4.6.0/include/node/v8.h: +/home/runuser/.node-gyp/4.6.0/include/node/v8-version.h: +/home/runuser/.node-gyp/4.6.0/include/node/v8config.h: +/home/runuser/.node-gyp/4.6.0/include/node/node_version.h: ../src/compat-inl.h: ../src/compat.h: -/root/.node-gyp/4.6.0/include/node/node_version.h: -/root/.node-gyp/4.6.0/include/node/v8.h: -/root/.node-gyp/4.6.0/include/node/v8-profiler.h: -/root/.node-gyp/4.6.0/include/node/uv.h: -/root/.node-gyp/4.6.0/include/node/uv-errno.h: -/root/.node-gyp/4.6.0/include/node/uv-version.h: -/root/.node-gyp/4.6.0/include/node/uv-unix.h: -/root/.node-gyp/4.6.0/include/node/uv-threadpool.h: -/root/.node-gyp/4.6.0/include/node/uv-linux.h: +/home/runuser/.node-gyp/4.6.0/include/node/node_version.h: +/home/runuser/.node-gyp/4.6.0/include/node/v8.h: +/home/runuser/.node-gyp/4.6.0/include/node/v8-profiler.h: +/home/runuser/.node-gyp/4.6.0/include/node/uv.h: +/home/runuser/.node-gyp/4.6.0/include/node/uv-errno.h: +/home/runuser/.node-gyp/4.6.0/include/node/uv-version.h: +/home/runuser/.node-gyp/4.6.0/include/node/uv-unix.h: +/home/runuser/.node-gyp/4.6.0/include/node/uv-threadpool.h: +/home/runuser/.node-gyp/4.6.0/include/node/uv-linux.h: ../src/heapdump-posix.h: diff --git a/node_modules/heapdump/build/addon.target.mk b/node_modules/heapdump/build/addon.target.mk index 5fd4df9..8f21dcd 100644 --- a/node_modules/heapdump/build/addon.target.mk +++ b/node_modules/heapdump/build/addon.target.mk @@ -34,10 +34,10 @@ -std=gnu++0x INCS_Debug := \ - -I/root/.node-gyp/4.6.0/include/node \ - -I/root/.node-gyp/4.6.0/src \ - -I/root/.node-gyp/4.6.0/deps/uv/include \ - -I/root/.node-gyp/4.6.0/deps/v8/include + -I/home/runuser/.node-gyp/4.6.0/include/node \ + -I/home/runuser/.node-gyp/4.6.0/src \ + -I/home/runuser/.node-gyp/4.6.0/deps/uv/include \ + -I/home/runuser/.node-gyp/4.6.0/deps/v8/include DEFS_Release := \ '-DNODE_GYP_MODULE_NAME=addon' \ @@ -71,10 +71,10 @@ -std=gnu++0x INCS_Release := \ - -I/root/.node-gyp/4.6.0/include/node \ - -I/root/.node-gyp/4.6.0/src \ - -I/root/.node-gyp/4.6.0/deps/uv/include \ - -I/root/.node-gyp/4.6.0/deps/v8/include + -I/home/runuser/.node-gyp/4.6.0/include/node \ + -I/home/runuser/.node-gyp/4.6.0/src \ + -I/home/runuser/.node-gyp/4.6.0/deps/uv/include \ + -I/home/runuser/.node-gyp/4.6.0/deps/v8/include OBJS := \ $(obj).target/$(TARGET)/src/heapdump.o diff --git a/node_modules/heapdump/build/config.gypi b/node_modules/heapdump/build/config.gypi index 29fd30a..fd4c1dc 100644 --- a/node_modules/heapdump/build/config.gypi +++ b/node_modules/heapdump/build/config.gypi @@ -46,7 +46,7 @@ "v8_random_seed": 0, "v8_use_snapshot": "true", "want_separate_host_toolset": 0, - "nodedir": "/root/.node-gyp/4.6.0", + "nodedir": "/home/runuser/.node-gyp/4.6.0", "copy_dev_lib": "true", "standalone_static_library": 1, "cache_lock_stale": "60000", @@ -68,7 +68,7 @@ "rollback": "true", "tag_version_prefix": "v", "cache_max": "Infinity", - "userconfig": "/root/.npmrc", + "userconfig": "/home/runuser/.npmrc", "engine_strict": "", "init_author_name": "", "init_author_url": "", @@ -89,7 +89,7 @@ "scope": "", "searchopts": "", "versions": "", - "cache": "/root/.npm", + "cache": "/home/runuser/.npm", "ignore_scripts": "", "searchsort": "name", "version": "", @@ -110,7 +110,7 @@ "unicode": "true", "long": "", "production": "", - "unsafe_perm": "", + "unsafe_perm": "true", "node_version": "4.6.0", "tag": "latest", "git_tag_version": "true", @@ -122,12 +122,12 @@ "strict_ssl": "true", "dev": "", "globalconfig": "/usr/local/nvm/versions/node/v4.6.0/etc/npmrc", - "init_module": "/root/.npm-init.js", + "init_module": "/home/runuser/.npm-init.js", "parseable": "", "globalignorefile": "/usr/local/nvm/versions/node/v4.6.0/etc/npmignore", "cache_lock_retries": "10", "save_prefix": "^", - "group": "", + "group": "1000", "init_author_email": "", "searchexclude": "", "git": "git", diff --git a/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json b/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json index 08b6b3f..198d453 100644 --- a/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json +++ b/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json @@ -50,7 +50,7 @@ "url": "https://github.com/substack/json-stable-stringify/issues"; }, "_id": "json-stable-stringify@1.0.0", - "_shasum": "b15db8802759bdf2b8aa4df457f9d39012670b17", + "_shasum": "c2cdc3e673a21c28d8f138408accffd639283e55", "_from": "git+https://github.com/wikimedia/json-stable-stringify.git#master";, "_resolved": "git+https://github.com/wikimedia/json-stable-stringify.git#c05178e4dfc3834017f017732934c1c52ba3dd8f"; } diff --git a/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/COPYING.txt b/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/COPYING.txt deleted file mode 100644 index c2bd1e5..0000000 --- a/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/COPYING.txt +++ /dev/null @@ -1,9 +0,0 @@ -Public Domain - -The person who associated a work with this deed has dedicated the work to the -public domain by waiving all of his or her rights to the work worldwide under -copyright law, including all related and neighboring rights, to the extent -allowed by law. - -You can copy, modify, distribute and perform the work, even for commercial -purposes, all without asking permission. diff --git a/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/LICENSE b/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/LICENSE new file mode 100644 index 0000000..cf1ab25 --- /dev/null +++ b/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/LICENSE @@ -0,0 +1,24 @@ +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. + +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +For more information, please refer to <http://unlicense.org> diff --git a/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.d.ts b/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.d.ts index e83ec05..964e7dc 100644 --- a/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.d.ts +++ b/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.d.ts @@ -18,7 +18,7 @@ export interface secretbox { (msg: Uint8Array, nonce: Uint8Array, key: Uint8Array): Uint8Array; - open(box: Uint8Array, nonce: Uint8Array, key: Uint8Array): Uint8Array; + open(box: Uint8Array, nonce: Uint8Array, key: Uint8Array): Uint8Array | false; readonly keyLength: number; readonly nonceLength: number; readonly overheadLength: number; @@ -33,8 +33,8 @@ namespace box { export interface open { - (msg: Uint8Array, nonce: Uint8Array, publicKey: Uint8Array, secretKey: Uint8Array): Uint8Array; - after(box: Uint8Array, nonce: Uint8Array, key: Uint8Array): Uint8Array; + (msg: Uint8Array, nonce: Uint8Array, publicKey: Uint8Array, secretKey: Uint8Array): Uint8Array | false; + after(box: Uint8Array, nonce: Uint8Array, key: Uint8Array): Uint8Array | false; } export interface keyPair { @@ -71,7 +71,7 @@ export interface sign { (msg: Uint8Array, secretKey: Uint8Array): Uint8Array; - open(signedMsg: Uint8Array, publicKey: Uint8Array): Uint8Array; + open(signedMsg: Uint8Array, publicKey: Uint8Array): Uint8Array | null; detached: sign.detached; keyPair: sign.keyPair; readonly publicKeyLength: number; diff --git a/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/package.json b/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/package.json index a4aad47..df9ee65 100644 --- a/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/package.json +++ b/node_modules/hyperswitch/node_modules/preq/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/package.json @@ -1,6 +1,6 @@ { "name": "tweetnacl", - "version": "0.14.4", + "version": "0.14.5", "description": "Port of TweetNaCl cryptographic library to JavaScript", "main": "nacl-fast.js", "types": "nacl.d.ts", @@ -38,7 +38,7 @@ "author": { "name": "TweetNaCl-js contributors" }, - "license": "SEE LICENSE IN COPYING.txt", + "license": "Unlicense", "bugs": { "url": "https://github.com/dchest/tweetnacl-js/issues"; }, @@ -57,9 +57,9 @@ "buffer": false, "crypto": false }, - "gitHead": "53024cf517ead075666dd430295bd0992dd2a48d", - "_id": "tweetnacl@0.14.4", - "_shasum": "8c9dbfb52795686f166cd2023794bcf103d13c2b", + "gitHead": "cce829e473b1ae299a9373b5140c713ee88f577f", + "_id": "tweetnacl@0.14.5", + "_shasum": "5ae68177f192d4456269d108afa93ff8743f4f64", "_from": "tweetnacl@>=0.14.0 <0.15.0", "_npmVersion": "3.10.8", "_nodeVersion": "7.0.0", @@ -68,8 +68,8 @@ "email": "dmi...@codingrobots.com" }, "dist": { - "shasum": "8c9dbfb52795686f166cd2023794bcf103d13c2b", - "tarball": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.4.tgz"; + "shasum": "5ae68177f192d4456269d108afa93ff8743f4f64", + "tarball": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; }, "maintainers": [ { @@ -79,7 +79,7 @@ ], "_npmOperationalInternal": { "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/tweetnacl-0.14.4.tgz_1480702221977_0.6762865034397691" + "tmp": "tmp/tweetnacl-0.14.5.tgz_1481627515097_0.015130913350731134" }, - "_resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.4.tgz"; + "_resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; } diff --git a/node_modules/hyperswitch/node_modules/swagger-ui/package.json b/node_modules/hyperswitch/node_modules/swagger-ui/package.json index cee1033..179c725 100644 --- a/node_modules/hyperswitch/node_modules/swagger-ui/package.json +++ b/node_modules/hyperswitch/node_modules/swagger-ui/package.json @@ -73,7 +73,7 @@ "url": "https://github.com/swagger-api/swagger-ui/issues"; }, "_id": "swagger-ui@2.2.8", - "_shasum": "753b20b991b3a3794015b6f7bc8802d3dc3a0dc9", + "_shasum": "c393a813309dc50357b551434034515227e94f5c", "_from": "git+https://github.com/wikimedia/swagger-ui.git#master";, "_resolved": "git+https://github.com/wikimedia/swagger-ui.git#b9b40dc8e00caeb24c19fe636b93250a7e335541"; } diff --git a/node_modules/json-stable-stringify/package.json b/node_modules/json-stable-stringify/package.json index 992d941..477002f 100644 --- a/node_modules/json-stable-stringify/package.json +++ b/node_modules/json-stable-stringify/package.json @@ -50,7 +50,7 @@ "url": "https://github.com/substack/json-stable-stringify/issues"; }, "_id": "json-stable-stringify@1.0.0", - "_shasum": "9f10697229647eb4af62ff8a0f5fa3e9f2dd1f54", + "_shasum": "2726b961529201b312dfd4bf0a7aa1d3ba07f24a", "_from": "git+https://github.com/wikimedia/json-stable-stringify.git#master";, "_resolved": "git+https://github.com/wikimedia/json-stable-stringify.git#c05178e4dfc3834017f017732934c1c52ba3dd8f"; } diff --git a/node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json b/node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json index 08b6b3f..198d453 100644 --- a/node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json +++ b/node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json @@ -50,7 +50,7 @@ "url": "https://github.com/substack/json-stable-stringify/issues"; }, "_id": "json-stable-stringify@1.0.0", - "_shasum": "b15db8802759bdf2b8aa4df457f9d39012670b17", + "_shasum": "c2cdc3e673a21c28d8f138408accffd639283e55", "_from": "git+https://github.com/wikimedia/json-stable-stringify.git#master";, "_resolved": "git+https://github.com/wikimedia/json-stable-stringify.git#c05178e4dfc3834017f017732934c1c52ba3dd8f"; } diff --git a/node_modules/service-runner/lib/logger.js b/node_modules/service-runner/lib/logger.js index 814af94..486a3ca 100644 --- a/node_modules/service-runner/lib/logger.js +++ b/node_modules/service-runner/lib/logger.js @@ -296,27 +296,43 @@ } }; -Logger.prototype.log = function(level, info) { +/** + * Logs and info object with a specified level + * @param {string} level Log level and components, for example 'trace/request' + * @param {Object|Function} info log statement object, or a callback to lazily construct + * the log statement after we've decided that this particular + * level will be matched. + * @param {boolean} [force] optional argument to force sampled component logging even + * if the probability wasn't met. Used together with `isLoggable` + */ +Logger.prototype.log = function(level, info, force) { var simpleLevel; if (!level || !info) { return; } + function getLog(info) { + if (typeof info === "function") { + return info(); + } + return info; + } + if (Logger.logTrace) { simpleLevel = extractSimpleLevel(level); if (simpleLevel) { - this._log(info, simpleLevel, level, this._traceLogger); + this._log(getLog(info), simpleLevel, level, this._traceLogger); } return; } simpleLevel = this._getSimpleLogLevel(level); if (simpleLevel) { - this._log(info, simpleLevel, level, this._logger); + this._log(getLog(info), simpleLevel, level, this._logger); } else { - var componentLoggerConf = this._getComponentLogConfig(level); + var componentLoggerConf = this._getComponentLogConfig(level, force); if (componentLoggerConf) { - this._log(info, componentLoggerConf.level, level, componentLoggerConf.logger); + this._log(getLog(info), componentLoggerConf.level, level, componentLoggerConf.logger); } } }; diff --git a/node_modules/service-runner/lib/master.js b/node_modules/service-runner/lib/master.js index 5ed417f..090f199 100644 --- a/node_modules/service-runner/lib/master.js +++ b/node_modules/service-runner/lib/master.js @@ -133,7 +133,9 @@ var self = this; var worker = cluster.workers[workerId]; if (!worker || worker.state === 'disconnected') { - delete self.workerStatusMap[worker.process.pid]; + if (worker) { + delete self.workerStatusMap[worker.process.pid]; + } return; } self.workerStatusMap[worker.process.pid] = { diff --git a/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json b/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json index 8795b5d..b959dbd 100644 --- a/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json +++ b/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json @@ -75,7 +75,7 @@ }, "homepage": "https://github.com/kadtools/kad#readme";, "_id": "kad@1.3.6", - "_shasum": "eec5a0b62729dbad2e00ab5ef7931b4d77e8b2c9", + "_shasum": "941a0766c3801293c19333e0756cf2740ff08ffe", "_from": "git+https://github.com/gwicke/kad.git#master";, "_resolved": "git+https://github.com/gwicke/kad.git#f35971036f43814043245da82b12d035b7bbfd16"; } diff --git a/node_modules/service-runner/package.json b/node_modules/service-runner/package.json index 21ecbc5..047f7c2 100644 --- a/node_modules/service-runner/package.json +++ b/node_modules/service-runner/package.json @@ -1,6 +1,6 @@ { "name": "service-runner", - "version": "2.1.11", + "version": "2.1.13", "description": "Generic nodejs service supervisor / cluster runner", "main": "service-runner.js", "bin": { @@ -48,19 +48,19 @@ "mocha-jscs": "^5.0.1", "bunyan-prettystream": "git+https://github.com/hadfieldn/node-bunyan-prettystream.git#master"; }, - "gitHead": "a235e2f8460625cb5ee8fc64cc3071a5a070e063", - "_id": "service-runner@2.1.11", - "_shasum": "1b0c83666beef6cc0637f0573a5107d107eac5bb", + "gitHead": "9e0385bfc47357f3d5626ca1bf4aa5cf85bbc1ff", + "_id": "service-runner@2.1.13", + "_shasum": "e8ff78b93230d7d831ea3ed5587aa2292b829ceb", "_from": "service-runner@>=2.1.0 <3.0.0", "_npmVersion": "2.15.9", "_nodeVersion": "4.6.0", "_npmUser": { - "name": "pchelolo", - "email": "petrpche...@gmail.com" + "name": "doorman", + "email": "marko.obro...@gmail.com" }, "dist": { - "shasum": "1b0c83666beef6cc0637f0573a5107d107eac5bb", - "tarball": "https://registry.npmjs.org/service-runner/-/service-runner-2.1.11.tgz"; + "shasum": "e8ff78b93230d7d831ea3ed5587aa2292b829ceb", + "tarball": "https://registry.npmjs.org/service-runner/-/service-runner-2.1.13.tgz"; }, "maintainers": [ { @@ -77,9 +77,9 @@ } ], "_npmOperationalInternal": { - "host": "packages-18-east.internal.npmjs.com", - "tmp": "tmp/service-runner-2.1.11.tgz_1479323631278_0.7561438775155693" + "host": "packages-12-west.internal.npmjs.com", + "tmp": "tmp/service-runner-2.1.13.tgz_1481454485102_0.4104759928304702" }, "directories": {}, - "_resolved": "https://registry.npmjs.org/service-runner/-/service-runner-2.1.11.tgz"; + "_resolved": "https://registry.npmjs.org/service-runner/-/service-runner-2.1.13.tgz"; } diff --git a/restbase b/restbase index 3a67838..39d3478 160000 --- a/restbase +++ b/restbase @@ -1 +1 @@ -Subproject commit 3a67838a89630de9b9cb352f76a1485c2c85e245 +Subproject commit 39d3478deba4ca6fa2b62c9c05b850ece153ef37 -- To view, visit https://gerrit.wikimedia.org/r/326951 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie05fef27c49a9476225f4241e23d4b87ccb35524 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: Mobrovac <mobro...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
