Skip to content

Fix log broadcaster force flag (#6311) #6398

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
chainchad merged 2 commits into from
Apr 7, 2022
Merged

Fix log broadcaster force flag (#6311) #6398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5739ecc
Fix log broadcaster force flag (#6311)
Nic0S Mar 28, 2022
3476558
Fix error message for force mode (#6399)
Nic0S Apr 6, 2022
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
2 changes: 1 addition & 1 deletion core/chains/evm/log/broadcaster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ func (b *broadcaster) Start(context.Context) error {

// ReplayFromBlock implements the Broadcaster interface.
func (b *broadcaster) ReplayFromBlock(number int64, forceBroadcast bool) {
b.logger.Infof("Replay requested from block number: %v", number)
b.logger.Infow("Replay requested", "block number", number, "force", forceBroadcast)
select {
case b.replayChannel <- replayRequest{
fromBlock: number,
Expand Down
5 changes: 2 additions & 3 deletions core/cmd/remote_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,18 +127,17 @@ func (cli *Client) getPage(requestURI string, page int, model interface{}) (err

// ReplayFromBlock replays chain data from the given block number until the most recent
func (cli *Client) ReplayFromBlock(c *clipkg.Context) (err error) {

blockNumber := c.Int64("block-number")
if blockNumber <= 0 {
return cli.errorOut(errors.New("Must pass a positive value in '--block-number' parameter"))
}

forceBroadcast := c.Bool("force-broadcast")
forceBroadcast := c.Bool("force")

buf := bytes.NewBufferString("{}")
resp, err := cli.HTTP.Post(
fmt.Sprintf(
"/v2/replay_from_block/%v?force_broadcast=%s",
"/v2/replay_from_block/%v?force=%s",
blockNumber,
strconv.FormatBool(forceBroadcast),
), buf)
Expand Down
12 changes: 6 additions & 6 deletions core/web/replay_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ func (bdc *ReplayController) ReplayFromBlock(c *gin.Context) {
return
}

// check if force_broadcast query string parameter provided
var forceBroadcast bool
// check if "force" query string parameter provided
var force bool
var err error
if fb := c.Query("force_broadcast"); fb != "" {
forceBroadcast, err = strconv.ParseBool(fb)
if fb := c.Query("force"); fb != "" {
force, err = strconv.ParseBool(fb)
if err != nil {
jsonAPIError(c, http.StatusUnprocessableEntity, errors.Wrap(err, "boolean value required for 'force_broadcast' query string param"))
jsonAPIError(c, http.StatusUnprocessableEntity, errors.Wrap(err, "boolean value required for 'force' query string param"))
return
}
}
Expand Down Expand Up @@ -58,7 +58,7 @@ func (bdc *ReplayController) ReplayFromBlock(c *gin.Context) {
}
chainID := chain.ID()

if err := bdc.App.ReplayFromBlock(chainID, uint64(blockNumber), forceBroadcast); err != nil {
if err := bdc.App.ReplayFromBlock(chainID, uint64(blockNumber), force); err != nil {
jsonAPIError(c, http.StatusInternalServerError, err)
return
}
Expand Down