Skip to content

Commit

Permalink
Merge pull request #787 from AraiEzzra/refactor/disable-logs
Browse files Browse the repository at this point in the history 
Refactor / Disable excess logs
  • Loading branch information
@axelsheva
axelsheva committed Nov 15, 2019
2 parents 36fdfef + 52c1f83 commit 7e603de
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 49 deletions.
6 changes: 3 additions & 3 deletions core/driver/socket/index.ts
View file
Expand Up @@ -74,15 +74,15 @@ export class Socket {

connectPeer(peerAddress: PeerAddress, headers: SerializedFullHeaders): void {

logger.debug(`[SOCKET][connectPeer] connecting to ${peerAddressToString(peerAddress)}...`);
logger.trace(`[SOCKET][connectPeer] connecting to ${peerAddressToString(peerAddress)}...`);
const ws: SocketIOClient.Socket = io(
`ws://${peerAddressToString(peerAddress)}`,
PEER_SOCKET_CLIENT_CONFIG
);

ws.on(PEER_SOCKET_EVENTS.CONNECT, () => {

logger.debug(`[SOCKET][connectPeer] connected to ${peerAddressToString(peerAddress)}`);
logger.trace(`[SOCKET][connectPeer] connected to ${peerAddressToString(peerAddress)}`);

ws.emit(PEER_SOCKET_EVENTS.HEADERS, createBufferObject(headers, SchemaName.FullHeaders));
ws.on(PEER_SOCKET_EVENTS.HEADERS, (response: Buffer) => {
Expand All @@ -102,7 +102,7 @@ export class Socket {

const peerHeaders = deserialize(response);

logger.debug(`[Driver][Socket][onHeadersReceive] ${type} ${peerAddress.ip}, ` +
logger.trace(`[Driver][Socket][onHeadersReceive] ${type} ${peerAddress.ip}, ` +
`broadhash: ${peerHeaders.broadhash}, height: ${peerHeaders.height}, ` +
`buffer size: ${response.length} byte`);

Expand Down
1 change: 0 additions & 1 deletion core/loader.ts
View file
@@ -1,6 +1,5 @@
import * as path from 'path';
import { QueryFile } from 'pg-promise';
import { timeService as EskaTimeService } from 'eska-common';

import db from 'shared/driver/db';
import TransactionDispatcher from 'core/service/transaction';
Expand Down
25 changes: 6 additions & 19 deletions core/service/block.ts
View file
Expand Up @@ -421,11 +421,12 @@ class BlockService implements IBlockService {
}

if (verify) {
const resultCheckTransaction: ResponseEntity<void> = this.checkTransaction(trs, sender);
if (!resultCheckTransaction.success) {
errors.push(...resultCheckTransaction.errors);
const verifyResult: ResponseEntity = TransactionDispatcher.verifyUnconfirmed(trs, sender);
if (!verifyResult.success) {
errors.push(...verifyResult.errors);
logger.error(
`[Service][Block][checkTransactionsAndApplyUnconfirmed][error] ${errors.join('. ')}. `,
`[Service][Block][checkTransactionsAndApplyUnconfirmed] ` +
`${errors.join('. ')}. trs id: ${trs.id}`,
);
i--;
break;
Expand All @@ -451,20 +452,6 @@ class BlockService implements IBlockService {
return new ResponseEntity({ errors });
}

private checkTransaction(trs: Transaction<object>, sender: Account): ResponseEntity {
const validateResult = TransactionDispatcher.validate(trs);
if (!validateResult.success) {
return new ResponseEntity({ errors: [...validateResult.errors, 'checkTransaction'] });
}

const verifyResult: ResponseEntity = TransactionDispatcher.verifyUnconfirmed(trs, sender);
if (!verifyResult.success) {
return new ResponseEntity({ errors: [...verifyResult.errors, 'checkTransaction'] });
}

return new ResponseEntity();
}

private async applyBlock(
block: Block,
broadcast: boolean,
Expand Down Expand Up @@ -551,7 +538,7 @@ class BlockService implements IBlockService {
);

const removedTransactions = TransactionPool.batchRemove(block.transactions);
logger.debug(
logger.trace(
`[Service][Block][receiveBlock] removed transactions count: ${removedTransactions.length}`
);

Expand Down
4 changes: 2 additions & 2 deletions core/service/peer.ts
View file
Expand Up @@ -64,7 +64,7 @@ export class PeerService {
}

remove(peerAddress: PeerAddress, checkMinPeerCount: boolean = true) {
logger.debug(`${LOG_PREFIX}[remove] ${peerAddressToString(peerAddress)}`);
logger.trace(`${LOG_PREFIX}[remove] ${peerAddressToString(peerAddress)}`);
PeerMemoryRepository.remove(peerAddress);
PeerNetworkRepository.remove(peerAddress);
if (checkMinPeerCount && PeerMemoryRepository.count < config.CONSTANTS.PEERS_DISCOVER.MIN) {
Expand All @@ -81,7 +81,7 @@ export class PeerService {
if (checkQueue && SwapTransactionQueue.size && PeerNetworkRepository.count) {
SwapTransactionQueue.process();
}

let peers: Array<NetworkPeer> = [];
if (peerAddresses && isArray(peerAddresses)) {
peers = PeerNetworkRepository.getManyByAddress(peerAddresses);
Expand Down
34 changes: 17 additions & 17 deletions core/service/transaction/vote.ts
View file
Expand Up @@ -32,7 +32,7 @@ class TransactionVoteService implements IAssetService<IAssetVote> {
votes: trs.asset.votes.map((vote: string) => `${trs.asset.type}${vote}`),
reward: totals.reward || 0,
unstake: totals.unstake || 0,
airdropReward: airdropReward
airdropReward,
};
}

Expand Down Expand Up @@ -102,12 +102,12 @@ class TransactionVoteService implements IAssetService<IAssetVote> {
errors.push(...votesErrors);
}

const uniqVotes = trs.asset.votes.reduce((acc: Array<string>, vote: string) => {
const slicedVote: string = vote.slice(1);
if (acc.indexOf(slicedVote) === -1) {
acc.push(slicedVote);
const uniqVotes = trs.asset.votes.reduce((publicKeys: Array<string>, vote: string) => {
const publicKey: string = vote.slice(1);
if (publicKeys.indexOf(publicKey) === -1) {
publicKeys.push(publicKey);
}
return acc;
return publicKeys;
}, []);

if (trs.asset.votes.length > uniqVotes.length) {
Expand Down Expand Up @@ -211,16 +211,16 @@ class TransactionVoteService implements IAssetService<IAssetVote> {
const isDownVote = trs.asset.votes[0][0] === '-';
const votes = trs.asset.votes.map(vote => vote.substring(1));
if (isDownVote) {
votes.reduce((acc: Array<string>, delegatePublicKey: string) => {
const targetAccount: Account = AccountRepo.getByPublicKey(delegatePublicKey);
targetAccount.delegate.votes--;
acc.splice(acc.indexOf(delegatePublicKey), 1);
return acc;
votes.reduce((publicKeys: Array<string>, delegatePublicKey: string) => {
const delegateAccount: Account = AccountRepo.getByPublicKey(delegatePublicKey);
delegateAccount.delegate.votes--;
publicKeys.splice(publicKeys.indexOf(delegatePublicKey), 1);
return publicKeys;
}, sender.votes);
} else {
votes.forEach((delegatePublicKey) => {
const targetAccount: Account = AccountRepo.getByPublicKey(delegatePublicKey);
targetAccount.delegate.votes++;
const delegateAccount: Account = AccountRepo.getByPublicKey(delegatePublicKey);
delegateAccount.delegate.votes++;
});
sender.votes.push(...votes);
}
Expand Down Expand Up @@ -251,16 +251,16 @@ class TransactionVoteService implements IAssetService<IAssetVote> {
sender.votes.push(...votes);
if (!senderOnly) {
votes.forEach((newVote) => {
const targetAccount: Account = AccountRepo.getByPublicKey(newVote);
targetAccount.delegate.votes++;
const delegateAccount: Account = AccountRepo.getByPublicKey(newVote);
delegateAccount.delegate.votes++;
});
}
} else {
votes.forEach((vote: PublicKey) => {
sender.votes.splice(sender.votes.indexOf(vote), 1);
if (!senderOnly) {
const targetAccount: Account = AccountRepo.getByPublicKey(vote);
targetAccount.delegate.votes--;
const delegateAccount: Account = AccountRepo.getByPublicKey(vote);
delegateAccount.delegate.votes--;
}
});
}
Expand Down
14 changes: 7 additions & 7 deletions shared/model/Peer/networkPeer.ts
View file
Expand Up @@ -26,7 +26,7 @@ export class NetworkPeer extends Peer {
constructor(data: SerializedNetworkPeer) {
super(data);

logger.debug(`[Peer][new peer] ${peerAddressToString(data.peerAddress)}`);
logger.trace(`[Peer][new peer] ${peerAddressToString(data.peerAddress)}`);
this._isBanned = data.isBanned;

this._socket = data.socket;
Expand All @@ -38,7 +38,7 @@ export class NetworkPeer extends Peer {
});

this._socket.on(PEER_SOCKET_EVENTS.DISCONNECT, (reason) => {
logger.debug(`[NetworkPeer][disconnect]: ${reason}`);
logger.trace(`[NetworkPeer][disconnect]: ${reason}`);
this._socket.removeAllListeners();
if (reason !== 'client namespace disconnect') {
messageON(ActionTypes.REMOVE_PEER, data.peerAddress);
Expand Down Expand Up @@ -124,11 +124,11 @@ export class NetworkPeer extends Peer {

disconnect(): void {
this._socket.removeAllListeners();
logger.debug(`[NetworkPeer][disconnect] ${this.peerAddress.ip}`);
logger.trace(`[NetworkPeer][disconnect] ${this.peerAddress.ip}`);
if (this._socket.connected) {
logger.debug(`[NetworkPeer][disconnect] ${this.peerAddress.ip} was connected`);
logger.trace(`[NetworkPeer][disconnect] ${this.peerAddress.ip} was connected`);
this._socket.disconnect(true);
logger.debug(`[NetworkPeer][disconnect] ${this.peerAddress.ip} has disconnected`);
logger.trace(`[NetworkPeer][disconnect] ${this.peerAddress.ip} has disconnected`);
}
}

Expand All @@ -137,7 +137,7 @@ export class NetworkPeer extends Peer {
if (!Buffer.isBuffer(str)) {
return;
}

const response = deserialize(str);

if (!ALLOWED_METHODS.has(response.code) && config.NODE_ENV_IN !== NODE_ENV_ENUM.TEST) {
Expand All @@ -146,7 +146,7 @@ export class NetworkPeer extends Peer {
}

if (ALLOWED_BAN_PEER_METHODS.has(response.code) || !this._isBanned) {
logger.debug(`[SOCKET][ON_PEER_BROADCAST][${this.peerAddress.ip}], CODE: ${response.code}`);
logger.trace(`[SOCKET][ON_PEER_BROADCAST][${this.peerAddress.ip}], CODE: ${response.code}`);
messageON(response.code, { data: response.data, peerAddress });
} else {
logger.debug(`[SOCKET][ON_PEER_BROADCAST][${this.peerAddress.ip}] CODE: ${response.code} ` +
Expand Down

0 comments on commit 7e603de

Please sign in to comment.