Skip to content

Commit

Permalink
make logging more user friendly
Browse files Browse the repository at this point in the history
  • Loading branch information
acolytec3 committed Jan 27, 2025
1 parent 72dcef7 commit fa43349
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions packages/portalnetwork/examples/portalReplClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { hexToBytes } from '@ethereumjs/util'
import debug, { Debugger } from 'debug'
import { DEFAULT_BOOTNODES } from '../src/util/bootnodes'

const replDebugString = 'REPL'
class PortalNetworkRepl {
private node?: PortalNetwork
private historyNetwork?: BaseNetwork
Expand All @@ -19,7 +20,7 @@ class PortalNetworkRepl {
const privateKey = await keys.generateKeyPair('secp256k1')
this.enr = SignableENR.createFromPrivateKey(privateKey)

this.logger = debug(this.enr.nodeId.slice(0, 5)).extend('Portal')
this.logger = debug(replDebugString)

const nodeAddr = multiaddr(`/ip4/0.0.0.0/udp/${port}`)
this.enr.setLocationMultiaddr(nodeAddr)
Expand All @@ -43,7 +44,7 @@ class PortalNetworkRepl {

await this.node.start()

this.node.enableLog('*Portal*,*uTP*,*discv5*')
this.node.enableLog(replDebugString)

this.logger('Portal Network initialized successfully')
this.logger('History Network status:', !!this.historyNetwork)
Expand All @@ -64,7 +65,7 @@ class PortalNetworkRepl {
async action(topics: string) {
const context = this.context as any
const portalRepl: PortalNetworkRepl = context.portalRepl
portalRepl.node?.enableLog(topics)
portalRepl.node?.enableLog(`${replDebugString},${topics}`)
this.displayPrompt()
},
})
Expand Down Expand Up @@ -112,7 +113,7 @@ class PortalNetworkRepl {

const [network, enr, ...distancesStr] = args.split(' ')
const distances = distancesStr.map((d) => parseInt(d, 10))

let enrObject
switch (network.toLowerCase()) {
case 'history':
Expand Down Expand Up @@ -273,7 +274,7 @@ class PortalNetworkRepl {
portalRepl.logger(`${network} Network not initialized`)
return this.displayPrompt()
}

try {
ENR.decodeTxt(enr)
} catch (enrError) {
Expand All @@ -290,9 +291,9 @@ class PortalNetworkRepl {
} catch (error) {
this.context.portalRepl.logger.error('AddENR operation failed: %O', error)
}

this.displayPrompt()
}
},
})

replServer.defineCommand('status', {
Expand All @@ -318,9 +319,7 @@ class PortalNetworkRepl {
}

private getNetworkByName(network: string): BaseNetwork | undefined {
return network.toLowerCase() === 'history'
? this.historyNetwork
: this.stateNetwork
return network.toLowerCase() === 'history' ? this.historyNetwork : this.stateNetwork
}
}

Expand Down

0 comments on commit fa43349

Please sign in to comment.