Skip to content

Commit 6a4f7a0

Browse files
committed
feat(log): optimize event service logs
1 parent 89b53e6 commit 6a4f7a0

File tree

7 files changed

+14
-16
lines changed

7 files changed

+14
-16
lines changed

framework/src/main/java/org/tron/core/db/Manager.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2107,8 +2107,6 @@ private void startEventSubscribing() {
21072107

21082108
private void postSolidityFilter(final long oldSolidNum, final long latestSolidifiedBlockNumber) {
21092109
if (oldSolidNum >= latestSolidifiedBlockNumber) {
2110-
logger.warn("Post solidity filter failed, oldSolidity: {} >= latestSolidity: {}.",
2111-
oldSolidNum, latestSolidifiedBlockNumber);
21122110
return;
21132111
}
21142112

framework/src/main/java/org/tron/core/net/service/relay/RelayService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public boolean checkHelloMessage(HelloMessage message, Channel channel) {
142142
return false;
143143
}
144144

145-
if (getPeerCountByAddress(msg.getAddress()) >= MAX_PEER_COUNT_PER_ADDRESS) {
145+
if (getPeerCountByAddress(msg.getAddress()) > MAX_PEER_COUNT_PER_ADDRESS) {
146146
logger.warn("HelloMessage from {}, the number of peers of {} exceeds {}.",
147147
channel.getInetAddress(),
148148
ByteArray.toHexString(msg.getAddress().toByteArray()),

framework/src/main/java/org/tron/core/services/event/BlockEventCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public static void init(BlockCapsule.BlockId blockId) {
4343
}
4444

4545
public static void add(BlockEvent blockEvent) throws EventException {
46-
logger.info("Add block event, {}", blockEvent.getBlockId().getString(),
46+
logger.info("Add block event, {}, {}", blockEvent.getBlockId().getString(),
4747
blockEvent.getParentId().getString());
4848
if (blockEventMap.get(blockEvent.getParentId()) == null) {
4949
throw new EventException("unlink BlockEvent, "

framework/src/main/java/org/tron/core/services/event/BlockEventLoad.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ public void init() {
3333
executor.scheduleWithFixedDelay(() -> {
3434
try {
3535
load();
36-
} catch (Exception exception) {
36+
} catch (Exception e) {
3737
close();
38-
logger.error("Spread thread error", exception);
38+
logger.error("Event load service fail.", e);
3939
}
4040
}, 100, 100, TimeUnit.MILLISECONDS);
4141
logger.info("Event load service start.");

framework/src/main/java/org/tron/core/services/event/HistoryEventService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ private void syncEvent() {
6262
}
6363
initEventService(manager.getChainBaseManager().getBlockIdByNum(endNum));
6464
} catch (InterruptedException e1) {
65-
logger.warn("Sync event interrupted.");
65+
logger.warn("History event service interrupted.");
6666
Thread.currentThread().interrupt();
6767
} catch (Exception e2) {
68-
logger.error("Sync event failed.", e2);
68+
logger.error("History event service fail.", e2);
6969
}
7070
}
7171

framework/src/main/java/org/tron/core/services/event/RealtimeEventService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void init() {
3838
try {
3939
work();
4040
} catch (Exception e) {
41-
logger.info("Real-time event service fail. {}", e);
41+
logger.error("Realtime event service fail.", e);
4242
}
4343
}, 1, 1, TimeUnit.SECONDS);
4444
logger.info("Realtime event service start.");
@@ -81,7 +81,7 @@ public void flush(BlockEvent blockEvent, boolean isRemove) {
8181
&& !instance.isTransactionLogTriggerSolidified()
8282
&& !isRemove) {
8383
if (blockEvent.getTransactionLogTriggerCapsules() == null) {
84-
logger.info("TransactionLogTriggerCapsules is null. {}",
84+
logger.warn("TransactionLogTriggerCapsules is null. {}",
8585
blockEvent.getBlockId().getString());
8686
} else {
8787
blockEvent.getTransactionLogTriggerCapsules().forEach(v ->
@@ -91,7 +91,7 @@ public void flush(BlockEvent blockEvent, boolean isRemove) {
9191

9292
if (instance.isContractEventTriggerEnable()) {
9393
if (blockEvent.getSmartContractTrigger() == null) {
94-
logger.info("SmartContractTrigger is null. {}", blockEvent.getBlockId().getString());
94+
logger.warn("SmartContractTrigger is null. {}", blockEvent.getBlockId().getString());
9595
} else {
9696
blockEvent.getSmartContractTrigger().getContractEventTriggers().forEach(v -> {
9797
v.setTriggerName(Trigger.CONTRACTEVENT_TRIGGER_NAME);

framework/src/main/java/org/tron/core/services/event/SolidEventService.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public void init() {
2929
executor.scheduleWithFixedDelay(() -> {
3030
try {
3131
work();
32-
} catch (Exception exception) {
33-
logger.error("Spread thread error", exception);
32+
} catch (Exception e) {
33+
logger.error("Solid event service fail.", e);
3434
}
3535
}, 1, 1, TimeUnit.SECONDS);
3636
logger.info("Solid event service start.");
@@ -67,7 +67,7 @@ public void flush(BlockEvent blockEvent) {
6767

6868
if (instance.isTransactionLogTriggerEnable() && instance.isTransactionLogTriggerSolidified()) {
6969
if (blockEvent.getTransactionLogTriggerCapsules() == null) {
70-
logger.info("TransactionLogTrigger is null. {}", blockEvent.getBlockId());
70+
logger.warn("TransactionLogTrigger is null. {}", blockEvent.getBlockId());
7171
} else {
7272
blockEvent.getTransactionLogTriggerCapsules().forEach(v ->
7373
manager.getTriggerCapsuleQueue().offer(v));
@@ -76,7 +76,7 @@ public void flush(BlockEvent blockEvent) {
7676

7777
if (instance.isSolidityEventTriggerEnable()) {
7878
if (blockEvent.getSmartContractTrigger() == null) {
79-
logger.info("SmartContractTrigger is null. {}", blockEvent.getBlockId());
79+
logger.warn("SmartContractTrigger is null. {}", blockEvent.getBlockId());
8080
} else {
8181
blockEvent.getSmartContractTrigger().getContractEventTriggers().forEach(v -> {
8282
v.setTriggerName(Trigger.SOLIDITYEVENT_TRIGGER_NAME);
@@ -100,7 +100,7 @@ public void flush(BlockEvent blockEvent) {
100100

101101
if (instance.isSolidityTriggerEnable()) {
102102
if (blockEvent.getSolidityTriggerCapsule() == null) {
103-
logger.info("SolidityTrigger is null. {}", blockEvent.getBlockId());
103+
logger.warn("SolidityTrigger is null. {}", blockEvent.getBlockId());
104104
} else {
105105
manager.getTriggerCapsuleQueue().offer(blockEvent.getSolidityTriggerCapsule());
106106
}

0 commit comments

Comments
 (0)