Skip to content

fix dhc config #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OmaiwoHochetDeneg wants to merge 2 commits into
base: server
Choose a base branch
from
Open

fix dhc config #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
496853c
fix dhc config
OmaiwoHochetDeneg Nov 17, 2021
c993960
Merge branch 'server' into dhc
OmaiwoHochetDeneg Nov 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/helpers/dhtservers_observer/DHTserversObserver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ class DHTserverObserver {
get_dhtservers(config) {
let ip_arr = []
let hexString
for (const dhtserver of config.data.dht) {
hexString = dhtserver.ip.toString(16);
ip_arr.push({ip: this.hex2dotted(hexString), port: dhtserver.port, time:0})
for (const dhtserver of config.data.dht.static_nodes.nodes) {
for (const address of dhtserver.addr_list.addrs) {
hexString = address.ip.toString(16);
ip_arr.push({ip: this.hex2dotted(hexString), port: address.port, time:0})
}
}
return ip_arr;
}
Expand Down
5 changes: 5 additions & 0 deletions src/wsserver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const dotenv = require('dotenv').config()
const WebSocket = require('ws');
var ServicesObserver = require('./services_observer/ServicesObserver');
var LiteserverObserver = require('./liteservers_observer/LiteserversObserver');
var DHTserversObserver = require('./dhtservers_Observer/DHTserversObserver');
let {metrics_service,bridge_service, interval_service} = require('./request')

module.exports = async function start_wsserver()
Expand All @@ -10,10 +11,12 @@ module.exports = async function start_wsserver()

let servicesObserver = new ServicesObserver()
let liteserversObserver = await LiteserverObserver.build(dotenv.parsed.LITESERVER_CONFIG_URL)
let dhtserversObserver = await DHTserversObserver.build(dotenv.parsed.LITESERVER_CONFIG_URL)

let lastData = JSON.stringify({
services: await servicesObserver.checkServices(),
liteservers: liteserversObserver.liteservers,
dhtservers: dhtserversObserver.dhtservers,
elections: metrics_service.get_elections_data(),
complaints: metrics_service.get_complaints(),
blocks_rate:metrics_service.get_blocks_rate(),
Expand Down Expand Up @@ -46,10 +49,12 @@ module.exports = async function start_wsserver()
console.log("fetching data...");

await liteserversObserver.check_liteservers()
await dhtserversObserver.check_dhtservers()

lastData = JSON.stringify({
services: await servicesObserver.checkServices(),
liteservers: liteserversObserver.liteservers,
dhtservers: dhtserversObserver.dhtservers,
elections: metrics_service.get_elections_data(),
complaints: metrics_service.get_complaints(),
blocks_rate:metrics_service.get_blocks_rate(),
Expand Down