From 6a4f7a0466a42ae531de9bec80324a76dce22d3b Mon Sep 17 00:00:00 2001 From: zeusoo001 Date: Fri, 21 Feb 2025 11:17:33 +0800 Subject: [PATCH] feat(log): optimize event service logs --- framework/src/main/java/org/tron/core/db/Manager.java | 2 -- .../org/tron/core/net/service/relay/RelayService.java | 2 +- .../org/tron/core/services/event/BlockEventCache.java | 2 +- .../org/tron/core/services/event/BlockEventLoad.java | 4 ++-- .../tron/core/services/event/HistoryEventService.java | 4 ++-- .../tron/core/services/event/RealtimeEventService.java | 6 +++--- .../tron/core/services/event/SolidEventService.java | 10 +++++----- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/framework/src/main/java/org/tron/core/db/Manager.java b/framework/src/main/java/org/tron/core/db/Manager.java index 55c248b1c14..096476a1bbe 100644 --- a/framework/src/main/java/org/tron/core/db/Manager.java +++ b/framework/src/main/java/org/tron/core/db/Manager.java @@ -2107,8 +2107,6 @@ private void startEventSubscribing() { private void postSolidityFilter(final long oldSolidNum, final long latestSolidifiedBlockNumber) { if (oldSolidNum >= latestSolidifiedBlockNumber) { - logger.warn("Post solidity filter failed, oldSolidity: {} >= latestSolidity: {}.", - oldSolidNum, latestSolidifiedBlockNumber); return; } diff --git a/framework/src/main/java/org/tron/core/net/service/relay/RelayService.java b/framework/src/main/java/org/tron/core/net/service/relay/RelayService.java index a1afa7dd1a8..161e918336b 100644 --- a/framework/src/main/java/org/tron/core/net/service/relay/RelayService.java +++ b/framework/src/main/java/org/tron/core/net/service/relay/RelayService.java @@ -142,7 +142,7 @@ public boolean checkHelloMessage(HelloMessage message, Channel channel) { return false; } - if (getPeerCountByAddress(msg.getAddress()) >= MAX_PEER_COUNT_PER_ADDRESS) { + if (getPeerCountByAddress(msg.getAddress()) > MAX_PEER_COUNT_PER_ADDRESS) { logger.warn("HelloMessage from {}, the number of peers of {} exceeds {}.", channel.getInetAddress(), ByteArray.toHexString(msg.getAddress().toByteArray()), diff --git a/framework/src/main/java/org/tron/core/services/event/BlockEventCache.java b/framework/src/main/java/org/tron/core/services/event/BlockEventCache.java index 40abae07946..aac457ba29b 100644 --- a/framework/src/main/java/org/tron/core/services/event/BlockEventCache.java +++ b/framework/src/main/java/org/tron/core/services/event/BlockEventCache.java @@ -43,7 +43,7 @@ public static void init(BlockCapsule.BlockId blockId) { } public static void add(BlockEvent blockEvent) throws EventException { - logger.info("Add block event, {}", blockEvent.getBlockId().getString(), + logger.info("Add block event, {}, {}", blockEvent.getBlockId().getString(), blockEvent.getParentId().getString()); if (blockEventMap.get(blockEvent.getParentId()) == null) { throw new EventException("unlink BlockEvent, " diff --git a/framework/src/main/java/org/tron/core/services/event/BlockEventLoad.java b/framework/src/main/java/org/tron/core/services/event/BlockEventLoad.java index 1af9d768c19..bebe3bcbc60 100644 --- a/framework/src/main/java/org/tron/core/services/event/BlockEventLoad.java +++ b/framework/src/main/java/org/tron/core/services/event/BlockEventLoad.java @@ -33,9 +33,9 @@ public void init() { executor.scheduleWithFixedDelay(() -> { try { load(); - } catch (Exception exception) { + } catch (Exception e) { close(); - logger.error("Spread thread error", exception); + logger.error("Event load service fail.", e); } }, 100, 100, TimeUnit.MILLISECONDS); logger.info("Event load service start."); diff --git a/framework/src/main/java/org/tron/core/services/event/HistoryEventService.java b/framework/src/main/java/org/tron/core/services/event/HistoryEventService.java index af9b7818640..73422944f08 100644 --- a/framework/src/main/java/org/tron/core/services/event/HistoryEventService.java +++ b/framework/src/main/java/org/tron/core/services/event/HistoryEventService.java @@ -62,10 +62,10 @@ private void syncEvent() { } initEventService(manager.getChainBaseManager().getBlockIdByNum(endNum)); } catch (InterruptedException e1) { - logger.warn("Sync event interrupted."); + logger.warn("History event service interrupted."); Thread.currentThread().interrupt(); } catch (Exception e2) { - logger.error("Sync event failed.", e2); + logger.error("History event service fail.", e2); } } diff --git a/framework/src/main/java/org/tron/core/services/event/RealtimeEventService.java b/framework/src/main/java/org/tron/core/services/event/RealtimeEventService.java index 8375b2fd114..0f46115bc5a 100644 --- a/framework/src/main/java/org/tron/core/services/event/RealtimeEventService.java +++ b/framework/src/main/java/org/tron/core/services/event/RealtimeEventService.java @@ -38,7 +38,7 @@ public void init() { try { work(); } catch (Exception e) { - logger.info("Real-time event service fail. {}", e); + logger.error("Realtime event service fail.", e); } }, 1, 1, TimeUnit.SECONDS); logger.info("Realtime event service start."); @@ -81,7 +81,7 @@ public void flush(BlockEvent blockEvent, boolean isRemove) { && !instance.isTransactionLogTriggerSolidified() && !isRemove) { if (blockEvent.getTransactionLogTriggerCapsules() == null) { - logger.info("TransactionLogTriggerCapsules is null. {}", + logger.warn("TransactionLogTriggerCapsules is null. {}", blockEvent.getBlockId().getString()); } else { blockEvent.getTransactionLogTriggerCapsules().forEach(v -> @@ -91,7 +91,7 @@ public void flush(BlockEvent blockEvent, boolean isRemove) { if (instance.isContractEventTriggerEnable()) { if (blockEvent.getSmartContractTrigger() == null) { - logger.info("SmartContractTrigger is null. {}", blockEvent.getBlockId().getString()); + logger.warn("SmartContractTrigger is null. {}", blockEvent.getBlockId().getString()); } else { blockEvent.getSmartContractTrigger().getContractEventTriggers().forEach(v -> { v.setTriggerName(Trigger.CONTRACTEVENT_TRIGGER_NAME); diff --git a/framework/src/main/java/org/tron/core/services/event/SolidEventService.java b/framework/src/main/java/org/tron/core/services/event/SolidEventService.java index 5bf83ea0da9..6178b247b1d 100644 --- a/framework/src/main/java/org/tron/core/services/event/SolidEventService.java +++ b/framework/src/main/java/org/tron/core/services/event/SolidEventService.java @@ -29,8 +29,8 @@ public void init() { executor.scheduleWithFixedDelay(() -> { try { work(); - } catch (Exception exception) { - logger.error("Spread thread error", exception); + } catch (Exception e) { + logger.error("Solid event service fail.", e); } }, 1, 1, TimeUnit.SECONDS); logger.info("Solid event service start."); @@ -67,7 +67,7 @@ public void flush(BlockEvent blockEvent) { if (instance.isTransactionLogTriggerEnable() && instance.isTransactionLogTriggerSolidified()) { if (blockEvent.getTransactionLogTriggerCapsules() == null) { - logger.info("TransactionLogTrigger is null. {}", blockEvent.getBlockId()); + logger.warn("TransactionLogTrigger is null. {}", blockEvent.getBlockId()); } else { blockEvent.getTransactionLogTriggerCapsules().forEach(v -> manager.getTriggerCapsuleQueue().offer(v)); @@ -76,7 +76,7 @@ public void flush(BlockEvent blockEvent) { if (instance.isSolidityEventTriggerEnable()) { if (blockEvent.getSmartContractTrigger() == null) { - logger.info("SmartContractTrigger is null. {}", blockEvent.getBlockId()); + logger.warn("SmartContractTrigger is null. {}", blockEvent.getBlockId()); } else { blockEvent.getSmartContractTrigger().getContractEventTriggers().forEach(v -> { v.setTriggerName(Trigger.SOLIDITYEVENT_TRIGGER_NAME); @@ -100,7 +100,7 @@ public void flush(BlockEvent blockEvent) { if (instance.isSolidityTriggerEnable()) { if (blockEvent.getSolidityTriggerCapsule() == null) { - logger.info("SolidityTrigger is null. {}", blockEvent.getBlockId()); + logger.warn("SolidityTrigger is null. {}", blockEvent.getBlockId()); } else { manager.getTriggerCapsuleQueue().offer(blockEvent.getSolidityTriggerCapsule()); }