cgeek/dwatcher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature: nommer les confs

Browse Source
This commit is contained in:
Cédric Moreau
2022-05-29 12:14:40 +02:00
parent 571248ffc4
commit 08ca7b6f86
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/types/conf.ts
View File

@@ -13,12 +13,15 @@ export interface Conf {
mail: ConfMail mail: ConfMail
} }
export interface ConfWebSocket { export interface NamedConf {
name: string name: string
}
export interface ConfWebSocket extends NamedConf {
address: string address: string
} }
export interface ConfWS2P { export interface ConfWS2P extends NamedConf {
address: string address: string
expectedPubkey: string expectedPubkey: string
salt: string salt: string
@@ -26,13 +29,12 @@ export interface ConfWS2P {
currency: string currency: string
} }
export interface ConfURL { export interface ConfURL extends NamedConf {
name: string
address: string address: string
frequency: number frequency: number
} }
export interface ConfWebDiff { export interface ConfWebDiff extends NamedConf {
file1: string file1: string
file2: string file2: string
frequency: number frequency: number

2
src/lib/watchers/bma/bma-watcher.ts
View File

@@ -16,7 +16,7 @@ export function bmaWatcher(conf: Conf) {
} }
return UrlWatcherResult.ok('Server is late by ' + (secondsLate / 3600).toFixed(2) + ' hours') return UrlWatcherResult.ok('Server is late by ' + (secondsLate / 3600).toFixed(2) + ' hours')
})({ })({
name: `BMA ${bmaServer.address}`, name: `BMA ${bmaServer.address} (${bmaServer.name})`,
address: bmaServer.address + URL_PATH, address: bmaServer.address + URL_PATH,
frequency: bmaServer.frequency frequency: bmaServer.frequency
}, },

2
src/lib/watchers/bma/head-watcher.ts
View File

@@ -33,7 +33,7 @@ export function headWatcher(conf: Conf) {
const observedHead = getObserved(heads, confHead.observedPubkey) const observedHead = getObserved(heads, confHead.observedPubkey)
return handleLateness(confHead, mainHeads, observedHead) return handleLateness(confHead, mainHeads, observedHead)
})({ })({
name: `head ${confHead.address} => ${confHead.observedPubkey.substr(0, KEY_LENGTH)}`, name: `head ${confHead.address} => ${confHead.observedPubkey.substr(0, KEY_LENGTH)} (${confHead.name})`,
address: confHead.address + URL_PATH, address: confHead.address + URL_PATH,
frequency: confHead.frequency frequency: confHead.frequency
}, },

2
src/lib/watchers/bma/membership-watcher.ts
View File

@@ -30,7 +30,7 @@ export function membershipWatcher(conf: Conf) {
state = 'OK' state = 'OK'
return UrlWatcherResult.ok() return UrlWatcherResult.ok()
})({ })({
name: `membership ${confMS.pubkey.substr(0, 6)}`, name: `membership ${confMS.pubkey.substr(0, 6)} (${confMS.name})`,
address: confMS.address + URL_PATH + confMS.pubkey, address: confMS.address + URL_PATH + confMS.pubkey,
frequency: confMS.frequency frequency: confMS.frequency
}, },

2
src/lib/watchers/wotwizard/json-watcher.ts
View File

@@ -20,7 +20,7 @@ export function jsonWatcher(conf: Conf) {
const data = parseData(html) const data = parseData(html)
return handleLateness(confWWMeta, data) return handleLateness(confWWMeta, data)
})({ })({
name: `WWData watcher ${confWWMeta.address}`, name: `WWData watcher ${confWWMeta.name}`,
address: confWWMeta.address + URL_PATH, address: confWWMeta.address + URL_PATH,
frequency: confWWMeta.frequency frequency: confWWMeta.frequency
}, },

2
src/lib/watchers/ws2p/ws2p-watcher.ts
View File

@@ -17,7 +17,7 @@ export function ws2pWatcher(conf: Conf) {
const target = `${wserver.address} (${wserver.expectedPubkey.substr(0, 8)})` const target = `${wserver.address} (${wserver.expectedPubkey.substr(0, 8)})`
return watcherLoop( return watcherLoop(
`WS2P ${wserver.address}`, `WS2P ${wserver.name}`,
async () => { async () => {
const localAuth = new WS2PPubkeyLocalAuth(wserver.currency, keypair, "", async () => true) const localAuth = new WS2PPubkeyLocalAuth(wserver.currency, keypair, "", async () => true)