embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(@embark/whisper): fix whisper status check

This commit is contained in:
Jonathan Rainville 2019-12-13 14:29:46 -05:00 committed by Iuri Matias
parent ee56f37713
commit 926b2bb046
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/plugins/whisper-geth/src/index.js
View File

@ -4,7 +4,7 @@ const constants = require("embark-core/constants");
const API = require("./api.js");
import { BlockchainProcessLauncher } from "./blockchainProcessLauncher";
import { ws, rpcWithEndpoint } from "./check.js";
const { normalizeInput } = require("embark-utils");
const { normalizeInput, buildUrlFromConfig } = require("embark-utils");
class Whisper {
constructor(embark, _options) {
@ -64,10 +64,11 @@ class Whisper {
registerServiceCheck() {
this.events.request("services:register", "Whisper", (cb) => {
if (this.blockchainConfig.endpoint.startsWith('ws')) {
return ws(this.blockchainConfig.endpoint, (err, version) => this._getNodeState(err, version, cb));
const endpoint = buildUrlFromConfig(this.communicationConfig.connection);
if (endpoint.startsWith('ws')) {
return ws(endpoint, (err, version) => this._getNodeState(err, version, cb));
}
rpcWithEndpoint(this.blockchainConfig.endpoint, (err, version) => this._getNodeState(err, version, cb));
rpcWithEndpoint(endpoint, (err, version) => this._getNodeState(err, version, cb));
}, 5000, "off");
}