Skip to content

Commit

Permalink
Merge pull request #520 from khaihkd/master
Browse files Browse the repository at this point in the history
update logger
  • Loading branch information
khaihkd authored Dec 14, 2018
2 parents 76e2b0f + a9b16fc commit 2e27d1b
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 21 deletions.
2 changes: 1 addition & 1 deletion server/src/api/AccountController.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ AccountController.get('/accounts', async (req, res) => {

return res.json(data)
} catch (e) {
logger.error(e)
logger.warn(e)
return res.status(500).send()
}
})
Expand Down
4 changes: 2 additions & 2 deletions server/src/crawl.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ let watch = async () => {
}
}
} catch (e) {
logger.error(e)
logger.error('Sleep 2 seconds before going back to work')
logger.warn(e)
logger.warn('Sleep 2 seconds before going back to work')
await sleep(2000)
return watch()
}
Expand Down
8 changes: 5 additions & 3 deletions server/src/helpers/account.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ let AccountHelper = {

web3.eth.getBalance(hash, function (err, balance) {
if (err) {
logger.error(err)
logger.warn('get balance of account %s has error', hash)
logger.warn(err)
} else {
_account.balance = balance
_account.balanceNumber = balance
Expand Down Expand Up @@ -49,7 +50,8 @@ let AccountHelper = {

web3.eth.getBalance(hash, function (err, balance) {
if (err) {
logger.error(err)
logger.warn('get balance of account %s has error', hash)
logger.warn(err)
} else {
_account.balance = balance
_account.balanceNumber = balance
Expand Down Expand Up @@ -80,7 +82,7 @@ let AccountHelper = {
await db.Account.updateOne({ hash: hash }, _account,
{ upsert: true, new: true })
} catch (e) {
logger.error(e)
logger.warn(e)
}
},
async formatAccount (account) {
Expand Down
5 changes: 3 additions & 2 deletions server/src/helpers/block.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ let BlockHelper = {

return block
} catch (e) {
logger.error(e)
logger.warn(e)
logger.warn('cannot get block %s', hashOrNumber)
return {}
}
},
Expand Down Expand Up @@ -150,7 +151,7 @@ let BlockHelper = {

return _block
} catch (e) {
logger.error(e)
logger.warn(e)
return {}
}
},
Expand Down
6 changes: 3 additions & 3 deletions server/src/helpers/tomo.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let blockSigner = {
getSigners: async (blockHash) => {
let bs = await blockSigner.getBlockSignerContract()
return bs.methods.getSigners(blockHash).call().catch(e => {
logger.error('Cannot get signer of block %s. Sleep 2 seconds and try more', blockHash)
logger.warn('Cannot get signer of block %s. Sleep 2 seconds and try more', blockHash)
return sleep(2000).then(() => {
return blockSigner.getSigners(blockHash)
})
Expand All @@ -33,7 +33,7 @@ let tomoValidator = {
getCandidateOwner: async (candidate) => {
let tc = await tomoValidator.getValidatorContract()
return tc.methods.getCandidateOwner(candidate).call().catch(e => {
logger.error('cannot get owner of candidate %s. Sleep 2 seconds and try more', candidate)
logger.warn('cannot get owner of candidate %s. Sleep 2 seconds and try more', candidate)
return sleep(2000).then(() => {
return tomoValidator.getCandidateOwner(candidate)
})
Expand All @@ -42,7 +42,7 @@ let tomoValidator = {
getVoterCapacity: async (candidate, voter) => {
let tc = await tomoValidator.getValidatorContract()
return tc.methods.getVoterCap(candidate, voter).call().catch(e => {
logger.error('cannot get owner of candidate %s. Sleep 2 seconds and try more', candidate)
logger.warn('cannot get owner of candidate %s. Sleep 2 seconds and try more', candidate)
return sleep(2000).then(() => {
return tomoValidator.getVoterCapacity(candidate, voter)
})
Expand Down
3 changes: 2 additions & 1 deletion server/src/helpers/transaction.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ let TransactionHelper = {
await db.Tx.updateOne({ hash: hash }, tx,
{ upsert: true, new: true })
} catch (e) {
logger.error(e)
logger.warn('cannot crawl transaction %s', hash)
logger.warn(e)
}
},
getTxDetail: async (hash) => {
Expand Down
2 changes: 1 addition & 1 deletion server/src/queues/rewardValidator.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ consumer.task = async function (job, done) {
await db.Reward.insertMany(rewardValidator)
}
} catch (e) {
logger.error(e)
logger.warn(e)
done(e)
}

Expand Down
2 changes: 1 addition & 1 deletion server/src/queues/rewardVoter.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ consumer.task = async function (job, done) {
await db.Reward.insertMany(rewardVoter)
}
} catch (e) {
logger.error(e)
logger.warn(e)
done(e)
}

Expand Down
2 changes: 1 addition & 1 deletion server/src/queues/token.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ consumer.task = async function (job, done) {
token.status = true
token.save()
} catch (e) {
logger.error(e)
logger.warn(e)
done(e)
}

Expand Down
2 changes: 1 addition & 1 deletion server/src/queues/tokenHolder.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ consumer.task = async function (job, done) {
// Add holder to.
await TokenHolderHelper.updateQuality(token.to, token.address, token.value)
} catch (e) {
logger.error(e)
logger.warn(e)
done(e)
}

Expand Down
2 changes: 1 addition & 1 deletion server/src/queues/tokenTransaction.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ consumer.task = async function (job, done) {
.priority('normal').removeOnComplete(true)
.attempts(5).backoff({ delay: 2000, type: 'fixed' }).save()
} catch (e) {
logger.error(e)
logger.warn(e)
done(e)
}

Expand Down
7 changes: 3 additions & 4 deletions server/src/queues/updateBlockFinality.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
'use strict'

const db = require('../models')
const Web3 = require('../helpers/web3')
const logger = require('../helpers/logger')
const BlockHelper = require('../helpers/block')

const consumer = {}
consumer.name = 'BlockFinalityProcess'
consumer.processNumber = 1
consumer.task = async function (job, done) {
let web3 = await Web3.getWeb3()
let blocks = await db.Block.find({ finality: { $lt: 50 }, updateFinalityTime: { $lt: 10 } })
.sort({ number: -1 }).limit(500)
logger.info('Update finality %s blocks', blocks.length)
try {
let map = blocks.map(async function (block) {
let b = await web3.eth.getBlock(block.number)
let b = await BlockHelper.getBlock(block.number)
block.finality = b.hasOwnProperty('finality') ? parseInt(b.finality) : 0
block.updateFinalityTime = block.updateFinalityTime ? block.updateFinalityTime + 1 : 1
block.save()
})
await Promise.all(map)
done()
} catch (e) {
logger.error(e)
logger.warn(e)
done(e)
}
}
Expand Down

0 comments on commit 2e27d1b

Please sign in to comment.