Skip to content
This repository has been archived by the owner on Mar 23, 2023. It is now read-only.

Commit

Permalink
feat: logging (#380)
Browse files Browse the repository at this point in the history
* feat: add logging framework
* chore: change logger to log for ledger connect function
* chore: use electron-log for file logs
  • Loading branch information
ItsANameToo authored and faustbrian committed Oct 16, 2018
1 parent 7884b7c commit dedb4cf
Show file tree
Hide file tree
Showing 15 changed files with 163 additions and 138 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
"bip39": "^2.5.0",
"chart.js": "^2.7.2",
"dayjs": "^1.7.5",
"electron-log": "^2.2.17",
"jsonschema": "^1.2.4",
"localforage": "^1.7.2",
"lodash": "^4.17.11",
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/Button/ButtonClipboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export default {
document.execCommand('copy')
} catch (err) {
this.isCopySupported = false
console.error('Clipboard not supported!')
this.$logger.error('Clipboard not supported!')
}
document.body.removeChild(textArea)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export default {
], 'id')
})
} catch (error) {
console.error(error)
this.$logger.error(error)
this.$error(this.$t('COMMON.FAILED_FETCH', {
name: 'transactions',
msg: error.message
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/Input/InputAddress.vue
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ export default {
openQR () {
// TODO when the QR reader is available
console.error('QR reader is not available yet')
this.$logger.error('QR reader is not available yet')
},
updateInputValue (value) {
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/Passphrase/PassphraseInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export default {
},
openQR () {
// TODO when the QR reader is available
console.error('QR reader is not available yet')
this.$logger.error('QR reader is not available yet')
},
toggleVisible () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ export default {
generateNewPassphrase () {
this.secondPassphrase = WalletService.generateSecondPassphrase()
console.log(this.secondPassphrase)
},
async onSubmit () {
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/Transaction/TransactionModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ export default {
},
successfulResponse (response) {
console.log(response)
if (response.status !== 200) {
this.$logger.error(response)
return false
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export default {
try {
this.delegates = await this.$client.fetchDelegates()
} catch (error) {
console.error(error)
this.$logger.error(error)
this.$error(this.$t('COMMON.FAILED_FETCH', {
name: 'delegates',
msg: error.message
Expand All @@ -114,7 +114,7 @@ export default {
try {
this.votePublicKey = await this.$client.fetchWalletVote(this.wallet_fromRoute.address)
} catch (error) {
console.error(error)
this.$logger.error(error)
this.$error(this.$t('COMMON.FAILED_FETCH', {
name: 'fetch vote',
msg: error.message
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export default {
this.$store.dispatch('wallet/update', updatedWallet)
}
} catch (error) {
console.error(error)
this.$logger.error(error)
// TODO the error could mean that the wallet isn't on the blockchain yet
// this.$error(this.$t('COMMON.FAILED_FETCH', {
// name: 'wallet data',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default {
try {
this.transactions = await this.$client.fetchTransactions(this.wallet_fromRoute.address)
} catch (error) {
console.error(error)
this.$logger.error(error)
this.$error(this.$t('COMMON.FAILED_FETCH', {
name: 'transactions',
msg: error.message
Expand Down
2 changes: 2 additions & 0 deletions src/renderer/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import VTooltip from 'v-tooltip'
import VueGoodTablePlugin from 'vue-good-table'
import PortalVue from 'portal-vue'
import axios from 'axios'
import logger from 'electron-log'

import App from './App'
import i18n from './i18n'
Expand All @@ -19,6 +20,7 @@ import eventBus from '@/plugins/event-bus'

Vue.config.productionTip = false
Vue.http = Vue.prototype.$http = axios
Vue.logger = Vue.prototype.$logger = logger
Vue.prototype.$eventBus = eventBus

Vue.use(filters)
Expand Down
3 changes: 3 additions & 0 deletions src/renderer/services/crypto-compare.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import i18n from '@/i18n'
import alertEvents from '@/plugins/alert-events'
import dayjs from 'dayjs'
import { capitalize, keys, min, max } from 'lodash'
import logger from 'electron-log'

class CryptoCompare {
/**
Expand All @@ -24,6 +25,7 @@ class CryptoCompare {

return this.__transformMarketResponse(data)
} catch (error) {
logger.error(error)
alertEvents.$error(i18n.t('COMMON.FAILED_FETCH', {
name: i18n.t('MARKET.MARKET'),
msg: error.message
Expand Down Expand Up @@ -116,6 +118,7 @@ class CryptoCompare {
const response = await axios.get(uri, { params })
return this.__transformHistoricalResponse(response.data.Data, dateFormat)
} catch (error) {
logger.error(error)
alertEvents.$error(i18n.t('COMMON.FAILED_FETCH', {
name: i18n.t('MARKET.HISTORICAL_DATA'),
msg: error.message
Expand Down
7 changes: 4 additions & 3 deletions src/renderer/services/ledger-service.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import LedgerTransport from '@ledgerhq/hw-transport-node-hid'
import ArkLedger from '@arkecosystem/ledger-transport'
import queue from 'async/queue'
import logger from 'electron-log'

class LedgerService {
/**
Expand Down Expand Up @@ -31,7 +32,7 @@ class LedgerService {

return this.isConnected()
} catch (error) {
//
logger.log(error)
}

return false
Expand All @@ -46,7 +47,7 @@ class LedgerService {
try {
await this.transport.close()
} catch (error) {
//
logger.error(error)
}
}

Expand All @@ -61,7 +62,7 @@ class LedgerService {

return true
} catch (error) {
//
logger.error(error)
}

return false
Expand Down
10 changes: 6 additions & 4 deletions src/renderer/store/modules/ledger.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import ledgerService from '@/services/ledger-service'
import eventBus from '@/plugins/event-bus'
import { crypto } from '@arkecosystem/crypto'
import logger from 'electron-log'

export default {
namespaced: true,
Expand Down Expand Up @@ -146,6 +147,7 @@ export default {
try {
wallet = await this._vm.$client.fetchWallet(ledgerAddress)
} catch (error) {
logger.error(error)
const message = error.response ? error.response.data.message : error.message
if (message !== 'Wallet not found') {
throw error
Expand Down Expand Up @@ -177,7 +179,7 @@ export default {
}
}
} catch (error) {
//
logger.error(error)
}
commit('SET_WALLETS', [])
eventBus.$emit('ledger:wallets-updated', [])
Expand All @@ -197,7 +199,7 @@ export default {
accountIndex
})
} catch (error) {
//
logger.error(error)
}

return false
Expand All @@ -215,7 +217,7 @@ export default {
accountIndex
})
} catch (error) {
//
logger.error(error)
}

return false
Expand All @@ -236,7 +238,7 @@ export default {
data: transactionHex
})
} catch (error) {
//
logger.error(error)
}

return false
Expand Down
Loading

0 comments on commit dedb4cf

Please sign in to comment.