Merge branch 'v2.3.5_qc_fix_install_contract_log' into 'v2.3.5_qc' (merge request !281)

fix: add error log when install/upgrade failed fix: add error log when install/upgrade failed --story=1008517

Merge branch 'v2.3.5_qc_fix_install_contract_log' into 'v2.3.5_qc' (merge request !281)
fix: add error log when install/upgrade failed fix: add error log when install/upgrade failed --story=1008517
59092c8f · shaozhuguang · 6c4ab1d0 · 37b139ea · 59092c8f
Commit 59092c8f authored Sep 11, 2024 by shaozhuguang
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

contractmgr/contract_manager.go contractmgr/contract_manager.go +4 -2

No files found.
--- a/contractmgr/contract_manager.go
+++ b/contractmgr/contract_manager.go
@@ -862,11 +862,11 @@ func (r *ContractManagerRuntime) install(context protocol.TxSimContext, name, ve
 		context.GetTx().Payload.TxId, result.GasUsed)

 	if statusCode != commonPb.TxStatusCode_SUCCESS {
-		//return nil, nil, fmt.Errorf("%s, %s", errContractInitFail, result.Message)
+		r.log.Errorf("install contract %s:%s, failed: %s", name, version, string(result.Result))
 		return differentiateErr(blockVersion, runTime, result.Message)
 	}
 	if result.Code > 0 { //throw error
-		//return nil, nil, fmt.Errorf("%s, %s", errContractInitFail, result.Message)
+		r.log.Errorf("install contract %s:%s, failed: %s", name, version, result.Result)
 		return differentiateErr(blockVersion, runTime, result.Message)
 	}
 	if runTime == commonPb.RuntimeType_EVM {
@@ -989,11 +989,13 @@ func (r *ContractManagerRuntime) upgrade(context protocol.TxSimContext, contract
 	result, _, statusCode := context.CallContract(caller, contract, protocol.ContractUpgradeMethod,
 		callBytecode, upgradeParameters, 0, commonPb.TxType_INVOKE_CONTRACT)
 	if statusCode != commonPb.TxStatusCode_SUCCESS {
+		r.log.Errorf("upgrade contract %s:%s, failed: %s", contract.Name, contract.Version, result.Result)
 		return nil, nil, fmt.Errorf("%s, %s", errContractUpgradeFail, result.Message)

 	}

 	if result.Code > 0 { //throw error
+		r.log.Errorf("upgrade contract %s:%s, failed: %s", contract.Name, contract.Version, result.Result)
 		return nil, nil, fmt.Errorf("%s, %s", errContractUpgradeFail, result.Message)
 	}