Skip to content
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

Problem: node can't shutdown by signal #1647

Merged
merged 7 commits into from
Oct 18, 2024
Merged

Problem: node can't shutdown by signal #1647

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4249a69
Problem: node can't shutdown by signal
yihuang Oct 17, 2024
e733084
Update CHANGELOG.md
yihuang Oct 17, 2024
c16af6d
Merge branch 'main' into graceful-shutdown
yihuang Oct 17, 2024
cce96f3
update deps
yihuang Oct 17, 2024
df34a67
fix
mmsqe Oct 18, 2024
ab1df58
Update integration_tests/test_basic.py
mmsqe Oct 18, 2024
7432f50
Merge remote-tracking branch 'origin/main' into graceful-shutdown
mmsqe Oct 18, 2024
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## UNRELEASED

### Bug Fixes

* (cli)[#1647](https://github.com/crypto-org-chain/cronos/pull/1647) Fix node can't shutdown by signal.

### Improvements

* [#1645](https://github.com/crypto-org-chain/cronos/pull/1645) Gen test tx in parallel even in single node.
Expand Down
7 changes: 6 additions & 1 deletion app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1454,7 +1454,12 @@ func (app *App) Close() error {
}

err := stderrors.Join(errs...)
app.Logger().Info("Application gracefully shutdown", "error", err)
msg := "Application gracefully shutdown"
if err == nil {
app.Logger().Info(msg)
} else {
app.Logger().Error(msg, "error", err)
}
return err
}

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ replace (
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.20-0.20240926023215-d2275b4afb9a
// develop
github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20241009020150-a2ad87c8a1cc
github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20241017130935-816389c76eac
// Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities.
// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,8 @@ github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241015015202-783e224f9517
github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241015015202-783e224f9517/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM=
github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241015015202-783e224f9517 h1:CwheSMAqz+kYCFz/X4lZq3BJAWINm/hndzVkjOc/2mI=
github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241015015202-783e224f9517/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w=
github.com/crypto-org-chain/ethermint v0.6.1-0.20241009020150-a2ad87c8a1cc h1:EzwyKF5qc7UvOVMbUR+rE34b24tWbQc/Fp/Eer9s33A=
github.com/crypto-org-chain/ethermint v0.6.1-0.20241009020150-a2ad87c8a1cc/go.mod h1:LUv3b8+dRjqAI9UTml5XzjExT2ANyvjtkFssi7lIRb0=
github.com/crypto-org-chain/ethermint v0.6.1-0.20241017130935-816389c76eac h1:tSgcMmugbp5h5Xi2rRZBCwP37EfqxM6jmNv9qO/aNrI=
github.com/crypto-org-chain/ethermint v0.6.1-0.20241017130935-816389c76eac/go.mod h1:LUv3b8+dRjqAI9UTml5XzjExT2ANyvjtkFssi7lIRb0=
github.com/crypto-org-chain/go-block-stm v0.0.0-20240919080136-6c49aef68716 h1:OvD5Rm0B6LHUJk6z858UgwdP72jU2DuUdXeclRyKpDI=
github.com/crypto-org-chain/go-block-stm v0.0.0-20240919080136-6c49aef68716/go.mod h1:iwQTX9xMX8NV9k3o2BiWXA0SswpsZrDk5q3gA7nWYiE=
github.com/crypto-org-chain/go-ethereum v1.10.20-0.20240926023215-d2275b4afb9a h1:IUPD+dg1YQl8cLocxQ/Mbx/ObTgAgcrZlcBhFjsLO40=
Expand Down
4 changes: 2 additions & 2 deletions gomod2nix.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@ schema = 3
hash = "sha256-ozwVS2BhAoz+OOisAyMhgg+lq8FdQjf90xoOq9cxtGw="
replaced = "github.com/crypto-org-chain/go-ethereum"
[mod."github.com/evmos/ethermint"]
version = "v0.6.1-0.20241009020150-a2ad87c8a1cc"
hash = "sha256-He4f1fVYCqTfRqjJ2v3v+00aRX3RQcYzYrqy3VlDxt4="
version = "v0.6.1-0.20241017130935-816389c76eac"
hash = "sha256-DD2uiTxQKEwKP5tCETMZNX8it7G7e+MBFFMG3YpW6RA="
replaced = "github.com/crypto-org-chain/ethermint"
[mod."github.com/fatih/color"]
version = "v1.16.0"
Expand Down
3 changes: 3 additions & 0 deletions integration_tests/test_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,9 @@ def test_local_statesync(cronos, tmp_path_factory):
Path(home) / "config/app.toml",
base_port,
{
"json-rpc": {
"address": "127.0.0.1:26671",
mmsqe marked this conversation as resolved.
Show resolved Hide resolved
},
mmsqe marked this conversation as resolved.
Show resolved Hide resolved
"versiondb": {
"enable": True,
},
Expand Down
Loading