feature: nommer les confs

src/lib/types/conf.ts

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

src/lib/watchers/bma/bma-watcher.ts

@@ -16,7 +16,7 @@ export function bmaWatcher(conf: Conf) {
       }
       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,
       frequency: bmaServer.frequency
     },

src/lib/watchers/bma/head-watcher.ts

@@ -33,7 +33,7 @@ export function headWatcher(conf: Conf) {
       const observedHead = getObserved(heads, confHead.observedPubkey)
       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,
       frequency: confHead.frequency
     },

src/lib/watchers/bma/membership-watcher.ts

@@ -30,7 +30,7 @@ export function membershipWatcher(conf: Conf) {
       state = '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,
       frequency: confMS.frequency
     },

src/lib/watchers/wotwizard/json-watcher.ts

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

src/lib/watchers/ws2p/ws2p-watcher.ts

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