Skip to content

Commit

Permalink
v5.0.1 use latest meshblu libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
iamruinous / virgilvox committed May 15, 2017
1 parent ce73d50 commit b343a9f
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 49 deletions.
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "meshblu-server",
"version": "5.0.0",
"version": "5.0.1",
"description": "A bundled version of meshblu-core",
"main": "index.js",
"repository": {
Expand All @@ -18,13 +18,13 @@
"author": "Octoblu, Inc <[email protected]>",
"license": "MIT",
"dependencies": {
"async": "^2.3.0",
"coffee-script": "^1.12.5",
"async": "^2.4.0",
"coffee-script": "^1.12.6",
"dashdash": "^1.14.0",
"debug": "^2.6.4",
"meshblu-core-dispatcher": "^18.2.4",
"meshblu-core-protocol-adapter-http": "^5.4.8",
"meshblu-core-worker-webhook": "^4.0.2",
"debug": "^2.6.6",
"meshblu-core-dispatcher": "^19.0.7",
"meshblu-core-protocol-adapter-http": "^5.4.14",
"meshblu-core-worker-webhook": "^4.1.2",
"sigterm-handler": "^2.0.0",
"uuid": "^3.0.1"
}
Expand Down
2 changes: 1 addition & 1 deletion src/meshblu-core-runner.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class MeshbluCoreRunner extends EventEmitter
@dispatcherWorker.run (error) =>
@emit 'error', error if error?

@webhookWorker.run (error) =>
@webhookWorker.start (error) =>
@emit 'error', error if error?

@meshbluHttp.run callback
Expand Down
75 changes: 34 additions & 41 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ [email protected], async@^1.4.0, async@^1.4.2, async@^1.5.0, async@^1.5.2:
version "1.5.2"
resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"

async@^2.0.0-rc.2, async@^2.0.0-rc.3, async@^2.0.0-rc.5, async@^2.0.1, async@^2.2.0, async@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/async/-/async-2.3.0.tgz#1013d1051047dd320fe24e494d5c66ecaf6147d9"
async@^2.0.0-rc.2, async@^2.0.0-rc.3, async@^2.0.0-rc.5, async@^2.0.1, async@^2.2.0, async@^2.3.0, async@^2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/async/-/async-2.4.0.tgz#4990200f18ea5b837c2cc4f8c031a6985c385611"
dependencies:
lodash "^4.14.0"

Expand Down Expand Up @@ -366,9 +366,9 @@ coffee-coverage@^1.0.1:
minimatch "^3.0.0"
pkginfo ">=0.2.3"

coffee-script@>=1.6.2, coffee-script@^1.10.0, coffee-script@^1.11.1, coffee-script@^1.12.2, coffee-script@^1.12.4, coffee-script@^1.12.5, coffee-script@^1.9.1, coffee-script@^1.9.2:
version "1.12.5"
resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.5.tgz#809f4585419112bbfe46a073ad7543af18c27346"
coffee-script@>=1.6.2, coffee-script@^1.10.0, coffee-script@^1.11.1, coffee-script@^1.12.2, coffee-script@^1.12.4, coffee-script@^1.12.5, coffee-script@^1.12.6, coffee-script@^1.9.1, coffee-script@^1.9.2:
version "1.12.6"
resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.6.tgz#285a3f7115689065064d6bf9ef4572db66695cbf"

colors@^1.1.2:
version "1.1.2"
Expand Down Expand Up @@ -488,12 +488,18 @@ [email protected]:
dependencies:
ms "0.7.2"

[email protected], debug@^2.1.3, debug@^2.2.0, debug@^2.5.1, debug@^2.6.4:
[email protected]:
version "2.6.4"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.4.tgz#7586a9b3c39741c0282ae33445c4e8ac74734fe0"
dependencies:
ms "0.7.3"

debug@^2.1.3, debug@^2.2.0, debug@^2.5.1, debug@^2.6.4, debug@^2.6.6:
version "2.6.6"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.6.tgz#a9fa6fbe9ca43cf1e79f73b75c0189cbb7d6db5a"
dependencies:
ms "0.7.3"

decamelize@^1.0.0, decamelize@^1.1.1:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
Expand Down Expand Up @@ -1365,9 +1371,9 @@ meshblu-core-datastore@^5.1.0:
json-stable-stringify "^1.0.1"
lodash "^4.11.1"

meshblu-core-dispatcher@^18.2.4:
version "18.2.4"
resolved "https://registry.yarnpkg.com/meshblu-core-dispatcher/-/meshblu-core-dispatcher-18.2.4.tgz#3d2b6a37e6f822315ec2813ee6f9baf21ab4ff55"
meshblu-core-dispatcher@^19.0.7:
version "19.0.7"
resolved "https://registry.yarnpkg.com/meshblu-core-dispatcher/-/meshblu-core-dispatcher-19.0.7.tgz#53174ecb80a95d205eae651795d76beb8b55c036"
dependencies:
"@octoblu/redis-ns" "^1.3.1"
async "^2.3.0"
Expand All @@ -1380,7 +1386,7 @@ meshblu-core-dispatcher@^18.2.4:
lodash "^4.17.4"
meshblu-core-cache "^1.9.1"
meshblu-core-datastore "^5.1.0"
meshblu-core-job-manager "^10.1.2"
meshblu-core-job-manager "^11.1.1"
meshblu-core-manager-token "^7.6.0"
meshblu-core-task-black-list-token "^1.0.0"
meshblu-core-task-check-broadcast-received-whitelist "^1.0.1"
Expand Down Expand Up @@ -1485,33 +1491,18 @@ meshblu-core-dispatcher@^18.2.4:
optionalDependencies:
hiredis "^0.5.0"

meshblu-core-job-manager@^10.1.2:
version "10.1.2"
resolved "https://registry.yarnpkg.com/meshblu-core-job-manager/-/meshblu-core-job-manager-10.1.2.tgz#cf5aed36dc62079a7c827856a8d2b74b2abd409c"
meshblu-core-job-manager@^11.1.0, meshblu-core-job-manager@^11.1.1, meshblu-core-job-manager@^11.2.1:
version "11.2.1"
resolved "https://registry.yarnpkg.com/meshblu-core-job-manager/-/meshblu-core-job-manager-11.2.1.tgz#f264128a4ade4e0494062a859da398ea6d93471f"
dependencies:
async "^2.3.0"
async "^2.4.0"
coffee-script "^1.12.5"
debug "^2.6.4"
generic-pool "^3.1.7"
ioredis "^2.5.0"
lodash "^4.17.2"
moment "^2.18.1"
uuid "^3.0.0"
when "^3.7.8"
optionalDependencies:
hiredis "^0.5.0"

meshblu-core-job-manager@^11.0.1:
version "11.0.2"
resolved "https://registry.yarnpkg.com/meshblu-core-job-manager/-/meshblu-core-job-manager-11.0.2.tgz#ad8f558e13c41246541c8eec278aee464b3f2da7"
dependencies:
async "^2.3.0"
coffee-script "^1.12.5"
debug "^2.6.4"
debug "^2.6.6"
generic-pool "^3.1.7"
ioredis "^2.5.0"
lodash "^4.17.2"
moment "^2.18.1"
simple-benchmark "^1.0.11"
uuid "^3.0.0"
when "^3.7.8"
optionalDependencies:
Expand Down Expand Up @@ -1638,20 +1629,20 @@ meshblu-core-manager-whitelist@^4.0.0, meshblu-core-manager-whitelist@^4.3.0:
meshblu-device-transmogrifier "^2.1.0"
meshblu-list-checker "^2.0.0"

meshblu-core-protocol-adapter-http@^5.4.8:
version "5.4.8"
resolved "https://registry.yarnpkg.com/meshblu-core-protocol-adapter-http/-/meshblu-core-protocol-adapter-http-5.4.8.tgz#b71c33a5e5ed64219ba2c61480f7c6cc09a171fb"
meshblu-core-protocol-adapter-http@^5.4.14:
version "5.4.14"
resolved "https://registry.yarnpkg.com/meshblu-core-protocol-adapter-http/-/meshblu-core-protocol-adapter-http-5.4.14.tgz#be72931f21d7c403377c72cc6adc7195133c295c"
dependencies:
"@octoblu/redis-ns" "^1.3.1"
async "^2.3.0"
async "^2.4.0"
coffee-script "^1.12.5"
colors "^1.1.2"
debug "^2.6.4"
debug "^2.6.6"
express-octoblu "^3.0.1"
ioredis "^2.5.0"
job-logger "^4.3.1"
lodash "^4.17.4"
meshblu-core-job-manager "^11.0.1"
meshblu-core-job-manager "^11.2.1"
meshblu-core-rate-limit-checker "^1.0.1"
request "^2.81.0"
server-destroy "^1.0.1"
Expand Down Expand Up @@ -2383,9 +2374,9 @@ meshblu-core-task-update-message-rate@^1.0.4:
coffee-script "^1.10.0"
lodash "^4.14.0"

meshblu-core-worker-webhook@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/meshblu-core-worker-webhook/-/meshblu-core-worker-webhook-4.0.2.tgz#d324fd6a9b290eeef9059671b54737fc11e2db3e"
meshblu-core-worker-webhook@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/meshblu-core-worker-webhook/-/meshblu-core-worker-webhook-4.1.2.tgz#4ff82e5d3da7b092049a6fbc41ae721cdadcb94d"
dependencies:
"@octoblu/redis-ns" "^1.3.1"
async "^2.0.1"
Expand All @@ -2397,13 +2388,15 @@ meshblu-core-worker-webhook@^4.0.2:
job-logger "^4.3.1"
lodash "^4.17.3"
meshblu-config "^6.3.0"
meshblu-core-job-manager "^11.1.0"
meshblu-http "^9.1.0"
nyc "^10.0.0"
octoblu-raven "^4.0.3"
request "^2.78.0"
sigterm-handler "^2.0.0"
simple-benchmark "^1.0.11"
validator "^6.2.0"
when "^3.7.8"
optionalDependencies:
hiredis "^0.5.0"

Expand Down

0 comments on commit b343a9f

Please sign in to comment.