Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feat/storage-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
yasserf committed Nov 28, 2017
2 parents 8b7b802 + 3d3ae2e commit 5d1aa73
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 136 deletions.
2 changes: 1 addition & 1 deletion bin/deepstream.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { daemon } from './deepstream-daemon'
const program = new Command('deepstream')
program
.usage('[command]')
.version(pgk.version)
.version(pgk.version.toString())

start(program)
install(program)
Expand Down
171 changes: 42 additions & 129 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"chai": "^4.1.2",
"coveralls": "^3.0.0",
"cucumber": "https://github.com/deepstreamIO/cucumber-js.git",
"deepstream.io-client-js": "https://github.com/deepstreamIO/deepstream.io-client-js.git",
"deepstream.io-client-js": "https://github.com/deepstreamIO/deepstream.io-client-js.git#v4",
"istanbul": "^0.4.5",
"jasmine": "^2.8.0",
"n0p3": "^1.0.2",
Expand Down
6 changes: 3 additions & 3 deletions src/cluster/cluster-node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ export default class ClusterNode implements Cluster {
public isLeader (): boolean { throw new Error('Leader not used in single state') }

public getStateRegistry (stateRegistryTopic: TOPIC) {
let stateRegistry = this.stateRegistries.get(name)
let stateRegistry = this.stateRegistries.get(stateRegistryTopic)
if (!stateRegistry) {
stateRegistry = new StateRegistry(name, {})
this.stateRegistries.set(name, stateRegistry)
stateRegistry = new StateRegistry(stateRegistryTopic, {})
this.stateRegistries.set(stateRegistryTopic, stateRegistry)
}
return stateRegistry
}
Expand Down
4 changes: 2 additions & 2 deletions test/test-mocks/message-connector-mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ export default class MessageConnectorMock extends EventEmitter implements Cluste

}

public send (topic, message) {
public send (stateRegistryTopic, message) {
this.publishedMessages.push(message)
this.lastPublishedTopic = message.topic
this.lastPublishedTopic = stateRegistryTopic
this.lastPublishedMessage = JSON.parse(JSON.stringify(message))
}

Expand Down

0 comments on commit 5d1aa73

Please sign in to comment.