Skip to content

Commit

Permalink
code refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
bugthesystem committed Jan 27, 2016
1 parent f25f5f9 commit 6e1204b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "microphone-core",
"version": "1.0.2",
"version": "1.0.3",
"description": "Microservice framework with powerful service discovery using Consul or ETCD",
"main": "lib/index.js",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions src/cluster.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ export default class Cluster {
await this._clusterProvider.bootstrapClientAsync();
}

async bootstrap(serviceName, version) {
var uri = this._frameworkProvider.start(serviceName, version);
async bootstrap(server, serviceName, version) {
var uri = this._frameworkProvider.start(server, serviceName, version);
var serviceId = serviceName + this._guidGenerator.newGuid();
await this._clusterProvider.registerServiceAsync(serviceName, serviceId, version, uri);
}
Expand Down
2 changes: 1 addition & 1 deletion src/framework-provider.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default class FrameworkProvider {
start(serviceName, version) {
start(server, serviceName, version) {
throw new Error("should be implemented in subclasses");
}
}
7 changes: 4 additions & 3 deletions tests/cluster.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,11 @@ describe("Cluster:", () => {
let serviceName = "test", version = "v1",
guid = "4e6605c7-bf83-4513-9fd5-d975314d8e52",
serviceId = serviceName + guid,
uri = "http://localhost:666/api/v1/bla";
uri = "http://localhost:666/api/v1/bla",
server = null;

frameworkProviderMock.expects('start')
.withArgs(serviceName, version)
.withArgs(server, serviceName, version)
.returns(uri)
.once();

Expand All @@ -112,7 +113,7 @@ describe("Cluster:", () => {
.withArgs(serviceName, serviceId, version, uri)
.once();

await cluster.bootstrap(serviceName, version);
await cluster.bootstrap(null, serviceName, version);
});
});

Expand Down

0 comments on commit 6e1204b

Please sign in to comment.