Skip to content

Commit 078b508

Browse files
authored
fix: Format date when output log. Catch exception when export public key info. (nervosnetwork#2877)
1 parent 3b733b0 commit 078b508

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

packages/neuron-wallet/src/controllers/export-debug.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,18 @@ export default class ExportDebugController {
137137
}
138138

139139
private async addHdPublicKeyInfoCsv() {
140-
const addressMetas = await AddressService.getAddressesByAllWallets()
141-
let csv = 'walletId,addressType,addressIndex,publicKeyInBlake160\n'
142-
for (const addressMeta of addressMetas) {
143-
const row = `${addressMeta.walletId},${addressMeta.addressType},${addressMeta.addressIndex},${addressMeta.blake160}\n`
144-
csv += row
140+
try {
141+
const addressMetas = await AddressService.getAddressesByAllWallets()
142+
let csv = 'walletId,addressType,addressIndex,publicKeyInBlake160\n'
143+
for (const addressMeta of addressMetas) {
144+
const row = `${addressMeta.walletId},${addressMeta.addressType},${addressMeta.addressIndex},${addressMeta.blake160}\n`
145+
csv += row
146+
}
147+
const csvFileName = 'hd_public_key_info.csv'
148+
this.archive.append(csv, { name: csvFileName })
149+
} catch (error) {
150+
logger.error(`Export Debug:\t export public key info error: ${error}`)
145151
}
146-
const csvFileName = 'hd_public_key_info.csv'
147-
this.archive.append(csv, { name: csvFileName })
148152
}
149153

150154
private addLogFiles = (files = ['main.log', 'renderer.log']) => {

packages/neuron-wallet/src/utils/logger.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ import env from '../env'
44
if (!env.isDevMode) {
55
logger.transports.file.level = 'info'
66
}
7-
7+
logger.transports.file.format = ({ date, level, data }) => {
8+
return `[${date.toISOString()}] [${level}] ${data}`
9+
}
10+
logger.transports.console.format = ({ date, level, data }) => {
11+
return `[${date.toISOString()}] [${level}] ${data}`
12+
}
813
// logger.catchErrors({ showDialog: false })
914

1015
export default logger

0 commit comments

Comments
 (0)