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

Jump to bottom

removing timeout when starting an node #1237

Merged
merged 5 commits into from
Sep 29, 2021
Merged

removing timeout when starting an node #1237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bcda11d
removing timeout when starting an node
vishalchangrani Sep 1, 2021
5900e73
Merge branch 'master' into vishal/remove_startup_timeout
vishalchangrani Sep 3, 2021
819f7e4
Merge branch 'master' into vishal/remove_startup_timeout
vishalchangrani Sep 20, 2021
645435b
Merge branch 'master' into vishal/remove_startup_timeout
vishalchangrani Sep 21, 2021
aa753ef
Merge branch 'master' into vishal/remove_startup_timeout
Kay-Zee Sep 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions cmd/node_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ type BaseConfig struct {
adminClientCAs string
BindAddr string
NodeRole string
timeout time.Duration
datadir string
secretsdir string
secretsDBEnabled bool
Expand Down Expand Up @@ -183,7 +182,6 @@ func DefaultBaseConfig() *BaseConfig {
adminClientCAs: NotSet,
BindAddr: NotSet,
BootstrapDir: "bootstrap",
timeout: 1 * time.Minute,
datadir: datadir,
secretsdir: NotSet,
secretsDBEnabled: true,
Expand Down
5 changes: 0 additions & 5 deletions cmd/scaffold.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ func (fnb *FlowNodeBuilder) BaseFlags() {
fnb.flags.StringVar(&fnb.BaseConfig.nodeIDHex, "nodeid", defaultConfig.nodeIDHex, "identity of our node")
fnb.flags.StringVar(&fnb.BaseConfig.BindAddr, "bind", defaultConfig.BindAddr, "address to bind on")
fnb.flags.StringVarP(&fnb.BaseConfig.BootstrapDir, "bootstrapdir", "b", defaultConfig.BootstrapDir, "path to the bootstrap directory")
fnb.flags.DurationVarP(&fnb.BaseConfig.timeout, "timeout", "t", defaultConfig.timeout, "node startup / shutdown timeout")
fnb.flags.StringVarP(&fnb.BaseConfig.datadir, "datadir", "d", defaultConfig.datadir, "directory to store the public database (protocol state)")
fnb.flags.StringVar(&fnb.BaseConfig.secretsdir, "secretsdir", defaultConfig.secretsdir, "directory to store private database (secrets)")
fnb.flags.StringVarP(&fnb.BaseConfig.level, "loglevel", "l", defaultConfig.level, "level for logging output")
Expand Down Expand Up @@ -939,8 +938,6 @@ func (fnb *FlowNodeBuilder) Run() {
select {
case <-fnb.Ready():
fnb.Logger.Info().Msgf("%s node startup complete", fnb.BaseConfig.NodeRole)
case <-time.After(fnb.BaseConfig.timeout):
fnb.Logger.Fatal().Msg("node startup timed out")
case <-fnb.sig:
fnb.Logger.Warn().Msg("node startup aborted")
os.Exit(1)
Expand All @@ -954,8 +951,6 @@ func (fnb *FlowNodeBuilder) Run() {
select {
case <-fnb.Done():
fnb.Logger.Info().Msgf("%s node shutdown complete", fnb.BaseConfig.NodeRole)
case <-time.After(fnb.BaseConfig.timeout):
fnb.Logger.Fatal().Msg("node shutdown timed out")
case <-fnb.sig:
fnb.Logger.Warn().Msg("node shutdown aborted")
os.Exit(1)
Expand Down