Skip to content

🔇fork log level to debug #1446

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

Merged
merged 1 commit into from
Sep 5, 2018
Merged

🔇fork log level to debug #1446

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
18 changes: 13 additions & 5 deletions src/main/java/org/tron/common/utils/ForkController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ public void init(Manager manager) {

public synchronized boolean shouldBeForked() {
if (forked) {
logger.info("*****shouldBeForked:" + true);
if (logger.isDebugEnabled()) {
logger.debug("*****shouldBeForked:" + true);
}
return true;
}

Expand All @@ -41,23 +43,29 @@ public synchronized boolean shouldBeForked() {

for (int version : slots) {
if (version != ChainConstant.version) {
logger.info("*****shouldBeForked:" + false);
if (logger.isDebugEnabled()) {
logger.debug("*****shouldBeForked:" + false);
}
return false;
}
}

// todo add Maintenance or block number
forked = true;
manager.getDynamicPropertiesStore().forked();
logger.info("*****shouldBeForked:" + true);
if (logger.isDebugEnabled()) {
logger.debug("*****shouldBeForked:" + true);
}
return true;
}

public synchronized void hardFork(TransactionCapsule capsule) throws ContractExeException {
boolean hardFork = shouldBeForked()
|| capsule.getInstance().getRawData().getContractList().get(0).getType().getNumber()
<= DISCARD_SCOPE;
logger.info("*****hardFork:" + hardFork);
if (logger.isDebugEnabled()) {
logger.debug("*****hardFork:" + hardFork);
}
if (!hardFork) {
throw new ContractExeException("not yet hard forked");
}
Expand All @@ -83,7 +91,7 @@ public synchronized void update(BlockCapsule blockCapsule) {
slots[slot] = version;

logger.info(
"*******update fork:" + Arrays.toString(slots)
"*******update hard fork:" + Arrays.toString(slots)
+ ",witness size:" + witnesses.size()
+ ",slot:" + slot
+ ",witness:" + ByteUtil.toHexString(witness.toByteArray())
Expand Down