Skip to content

Commit 04f0369

Browse files
committed
fix(logging): standardize error logs to use %e token
1 parent f5932c2 commit 04f0369

File tree

64 files changed

+149
-147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+149
-147
lines changed

packages/connection-encrypter-plaintext/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ class Plaintext implements ConnectionEncrypter {
107107
throw new InvalidCryptoExchangeError('Public key did not match id')
108108
}
109109
} catch (err: any) {
110-
log.error(err)
111-
throw new InvalidCryptoExchangeError('Invalid public key - ' + err.message)
110+
log.error('Invalid public key - %e', err)
111+
throw new InvalidCryptoExchangeError(`Invalid public key - ${err.message}`)
112112
}
113113

114114
if (options?.remotePeer != null && !peerId.equals(options?.remotePeer)) {

packages/interface-compliance-tests/src/mocks/connection.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,11 @@ export function mockConnection (maConn: MultiaddrConnection, opts: MockConnectio
155155

156156
await handler({ connection, stream: muxedStream })
157157
}).catch(err => {
158-
log.error(err)
158+
log.error('%e', err)
159159
muxedStream.abort(err)
160160
})
161161
} catch (err: any) {
162-
log.error(err)
162+
log.error('%e', err)
163163
}
164164
},
165165
onStreamEnd: (muxedStream) => {

packages/kad-dht/src/content-fetching/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export class ContentFetching {
106106
this.log(`Storing corrected record for key ${dsKey.toString()}`)
107107
await this.components.datastore.put(dsKey, fixupRec.subarray(), options)
108108
} catch (err: any) {
109-
this.log.error('Failed error correcting self', err)
109+
this.log.error('Failed error correcting self - %e', err)
110110
}
111111

112112
continue

packages/kad-dht/src/content-routing/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export class ContentRouting {
115115
yield addProviderEvent
116116
}
117117
} catch (err: any) {
118-
self.log.error('error sending provide record to peer %p', event.peer.id, err)
118+
self.log.error('error sending provide record to peer %p - %e', event.peer.id, err)
119119
yield queryErrorEvent({
120120
from: event.peer.id,
121121
error: err,

packages/kad-dht/src/kad-dht.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ export class KadDHT extends TypedEventEmitter<PeerDiscoveryEvents> implements Ka
297297
const peerData = evt.detail
298298

299299
this.onPeerConnect(peerData).catch(err => {
300-
this.log.error('could not add %p to routing table', peerData.id, err)
300+
this.log.error('could not add %p to routing table - %e', peerData.id, err)
301301
})
302302

303303
this.dispatchEvent(new CustomEvent('peer', {
@@ -320,7 +320,7 @@ export class KadDHT extends TypedEventEmitter<PeerDiscoveryEvents> implements Ka
320320

321321
await this.onPeerConnect(peerData)
322322
}).catch(err => {
323-
this.log.error('could not add %p to routing table - %e - %e', peerId, err)
323+
this.log.error('could not add %p to routing table - %e', peerId, err)
324324
})
325325
})
326326

@@ -347,7 +347,7 @@ export class KadDHT extends TypedEventEmitter<PeerDiscoveryEvents> implements Ka
347347
}
348348
})
349349
.catch(err => {
350-
this.log.error('error setting dht server mode', err)
350+
this.log.error('error setting dht server mode - %e', err)
351351
})
352352
})
353353
}
@@ -404,7 +404,7 @@ export class KadDHT extends TypedEventEmitter<PeerDiscoveryEvents> implements Ka
404404
signal
405405
})
406406
} catch (err: any) {
407-
this.log.error('could not add %p to routing table', peerData.id, err)
407+
this.log.error('could not add %p to routing table - %e', peerData.id, err)
408408
}
409409
}
410410

packages/kad-dht/src/network.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ export class Network extends TypedEventEmitter<NetworkEvents> implements Startab
188188

189189
stream.close(options)
190190
.catch(err => {
191-
this.log.error('error closing stream to %p', to, err)
191+
this.log.error('error closing stream to %p - %e', to, err)
192192
stream?.abort(err)
193193
})
194194

@@ -255,7 +255,7 @@ export class Network extends TypedEventEmitter<NetworkEvents> implements Startab
255255

256256
stream.close(options)
257257
.catch(err => {
258-
this.log.error('error closing stream to %p', to, err)
258+
this.log.error('error closing stream to %p - %e', to, err)
259259
stream?.abort(err)
260260
})
261261

packages/kad-dht/src/query-self.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export class QuerySelf implements Startable {
7676
this.timeoutId = setTimeout(() => {
7777
this.querySelf()
7878
.catch(err => {
79-
this.log.error('error running self-query', err)
79+
this.log.error('error running self-query - %e', err)
8080
})
8181
}, this.initialInterval)
8282
}
@@ -146,7 +146,7 @@ export class QuerySelf implements Startable {
146146
}
147147
}))
148148
} catch (err: any) {
149-
this.log.error('self-query error', err)
149+
this.log.error('self-query error - %e', err)
150150
} finally {
151151
signal.clear()
152152

@@ -167,7 +167,7 @@ export class QuerySelf implements Startable {
167167
this.timeoutId = setTimeout(() => {
168168
this.querySelf()
169169
.catch(err => {
170-
this.log.error('error running self-query', err)
170+
this.log.error('error running self-query - %e', err)
171171
})
172172
}, this.interval)
173173
}

packages/kad-dht/src/query/manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ export class QueryManager implements Startable {
217217
// Execute the query along each disjoint path and yield their results as they become available
218218
for await (const event of merge(...paths)) {
219219
if (event.name === 'QUERY_ERROR') {
220-
log.error('query error', event.error)
220+
log.error('query error - %e', event.error)
221221
}
222222

223223
if (event.name === 'PEER_RESPONSE') {

packages/kad-dht/src/reprovider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export class Reprovider extends TypedEventEmitter<ReprovideEvents> {
153153
})
154154
}
155155
} catch (err: any) {
156-
this.log.error('error processing datastore key %s - %e', entry.key, err.message)
156+
this.log.error('error processing datastore key %s - %s', entry.key, err.message)
157157
}
158158
}
159159

packages/kad-dht/src/routing-table/refresh.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,24 +107,24 @@ export class RoutingTableRefresh {
107107
try {
108108
await this._refreshCommonPrefixLength(n, lastRefresh, force, options)
109109
} catch (err: any) {
110-
this.log.error(err)
110+
this.log.error('%e', err)
111111
}
112112
}
113113
}
114114
} catch (err: any) {
115-
this.log.error(err)
115+
this.log.error('%e', err)
116116
}
117117
})
118118
).catch(err => {
119-
this.log.error(err)
119+
this.log.error('%e', err)
120120
}).then(() => {
121121
this.refreshTimeoutId = setTimeout(this.refreshTable, this.refreshInterval)
122122

123123
if (this.refreshTimeoutId.unref != null) {
124124
this.refreshTimeoutId.unref()
125125
}
126126
}).catch(err => {
127-
this.log.error(err)
127+
this.log.error('%e', err)
128128
})
129129
}
130130

0 commit comments

Comments
 (0)