Skip to content

fix(log): suppress spurious error logs when solidity node exits #6801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
317787106 wants to merge 1 commit into
base: release_v4.8.2
Choose a base branch
from
+333 −286
Open

fix(log): suppress spurious error logs when solidity node exits #6801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions framework/src/main/java/org/tron/program/SolidityNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,15 @@ private void getBlock() {
Block block = getBlockByNum(blockNum);
blockQueue.put(block);
blockNum = ID.incrementAndGet();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
logger.info("getBlock interrupted, exiting.");
return;
} catch (Exception e) {
if (!flag) {
logger.info("getBlock stopped during shutdown, last block: {}.", blockNum);
return;
}
logger.error("Failed to get block {}, reason: {}.", blockNum, e.getMessage());
sleep(exceptionSleepTime);
}
Expand Down Expand Up @@ -194,6 +202,10 @@ private long getLastSolidityBlockNum() {
blockNum, remoteBlockNum, System.currentTimeMillis() - time);
return blockNum;
} catch (Exception e) {
if (!flag) {
logger.info("getLastSolidityBlockNum stopped during shutdown.");
return 0;
}
logger.error("Failed to get last solid blockNum: {}, reason: {}.", remoteBlockNum.get(),
e.getMessage());
sleep(exceptionSleepTime);
Expand All @@ -205,8 +217,8 @@ private long getLastSolidityBlockNum() {
public void sleep(long time) {
try {
Thread.sleep(time);
} catch (Exception e1) {
logger.error(e1.getMessage());
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
}

Expand Down
Loading
Loading