Skip to content

Commit

Permalink
chore: log error in CatchControllerError
Browse files Browse the repository at this point in the history
  • Loading branch information
classicalliu committed Sep 2, 2019
1 parent 6c783e3 commit a0f9d9d
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 24 deletions.
3 changes: 2 additions & 1 deletion packages/neuron-wallet/src/controllers/networks/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import NetworksService, { NetworkType, NetworkID, Network } from 'services/networks'
import { NetworkType, NetworkID, Network } from 'types/network'
import NetworksService from 'services/networks'
import { CatchControllerError, Controller as ControllerDecorator } from 'decorators'
import { Channel, ResponseCode } from 'utils/const'
import { IsRequired, InvalidName, NetworkNotFound, CurrentNetworkNotSet } from 'exceptions'
Expand Down
2 changes: 2 additions & 0 deletions packages/neuron-wallet/src/decorators/errors.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { ResponseCode } from 'utils/const'
import logger from 'utils/logger'

export const CatchControllerError = (_target: any, _name: string, descriptor: PropertyDescriptor) => {
const originalMethod = descriptor.value
Expand All @@ -8,6 +9,7 @@ export const CatchControllerError = (_target: any, _name: string, descriptor: Pr
try {
return await originalMethod(...args)
} catch (err) {
logger.error(`CatchControllerError:`, err)
return {
status: ResponseCode.Fail,
message: typeof err.message === 'string' ? { content: err.message } : err.message,
Expand Down
2 changes: 1 addition & 1 deletion packages/neuron-wallet/src/env.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as path from 'path'
import app from 'app'
import { NetworkWithID } from 'services/networks'
import { NetworkWithID } from 'types/network'

const { NODE_ENV } = process.env

Expand Down
21 changes: 1 addition & 20 deletions packages/neuron-wallet/src/services/networks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,7 @@ import env from 'env'
import { Validate, Required } from 'decorators'
import { UsedName, NetworkNotFound, InvalidFormat } from 'exceptions'
import { NetworkListSubject, CurrentNetworkIDSubject } from 'models/subjects/networks'

export type NetworkID = string
export type NetworkName = string
export type NetworkRemote = string
export enum NetworksKey {
List = 'list',
Current = 'current',
}
export enum NetworkType {
Default,
Normal,
}
export interface Network {
name: NetworkName
remote: NetworkRemote
type: NetworkType
}
export interface NetworkWithID extends Network {
id: NetworkID
}
import { NetworkID, NetworkName, NetworkRemote, NetworksKey, NetworkType, Network, NetworkWithID } from 'types/network'

export const networkSwitchSubject = new BehaviorSubject<undefined | NetworkWithID>(undefined)

Expand Down
3 changes: 2 additions & 1 deletion packages/neuron-wallet/src/startup/sync-block-task/create.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { BrowserWindow } from 'electron'
import { ReplaySubject } from 'rxjs'
import path from 'path'
import { networkSwitchSubject, NetworkWithID } from 'services/networks'
import { networkSwitchSubject } from 'services/networks'
import { NetworkWithID } from 'types/network'
import env from 'env'
import AddressService from 'services/addresses'
import genesisBlockHash from './genesis'
Expand Down
2 changes: 1 addition & 1 deletion packages/neuron-wallet/src/startup/sync-block-task/task.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { remote } from 'electron'
import { initConnection as initAddressConnection } from 'database/address/ormconfig'
import AddressesUsedSubject from 'models/subjects/addresses-used-subject'
import { NetworkWithID } from 'services/networks'
import { NetworkWithID } from 'types/network'
import { register as registerTxStatusListener } from 'listeners/tx-status'
import { register as registerAddressListener } from 'listeners/address'
import IndexerRPC from 'services/indexer/indexer-rpc'
Expand Down
19 changes: 19 additions & 0 deletions packages/neuron-wallet/src/types/network.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
export type NetworkID = string
export type NetworkName = string
export type NetworkRemote = string
export enum NetworksKey {
List = 'list',
Current = 'current',
}
export enum NetworkType {
Default,
Normal,
}
export interface Network {
name: NetworkName
remote: NetworkRemote
type: NetworkType
}
export interface NetworkWithID extends Network {
id: NetworkID
}

0 comments on commit a0f9d9d

Please sign in to comment.