Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
burrow
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hang Yu
burrow
Commits
e8507b75
Unverified
Commit
e8507b75
authored
8 years ago
by
Benjamin Bollen
Browse files
Options
Downloads
Patches
Plain Diff
Fix bug: failure to load Tendermint configuration file; error was silently ignored
improve error line
parent
54c17aba
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
consensus/tendermint/tendermint.go
+1
-1
1 addition, 1 deletion
consensus/tendermint/tendermint.go
core/core.go
+3
-1
3 additions, 1 deletion
core/core.go
with
4 additions
and
2 deletions
consensus/tendermint/tendermint.go
+
1
−
1
View file @
e8507b75
...
...
@@ -62,7 +62,7 @@ func NewTendermintNode(moduleConfig *config.ModuleConfig,
// to be written in tendermint's root directory.
// NOTE: [ben] as elsewhere Sub panics if config file does not have this
// subtree. To shield in go-routine, or PR to viper.
if
!
moduleConfig
.
Config
.
IsSet
(
"config
h
uration"
)
{
if
!
moduleConfig
.
Config
.
IsSet
(
"configuration"
)
{
return
nil
,
fmt
.
Errorf
(
"Failed to extract Tendermint configuration subtree."
)
}
tendermintConfigViper
:=
moduleConfig
.
Config
.
Sub
(
"configuration"
)
...
...
This diff is collapsed.
Click to expand it.
core/core.go
+
3
−
1
View file @
e8507b75
...
...
@@ -58,7 +58,9 @@ func NewCore(chainId string, consensusConfig *config.ModuleConfig,
}
log
.
Debug
(
"Loaded pipe with application manager"
)
// pass the consensus engine into the pipe
consensus
.
LoadConsensusEngineInPipe
(
consensusConfig
,
pipe
)
if
e
:=
consensus
.
LoadConsensusEngineInPipe
(
consensusConfig
,
pipe
);
e
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"Failed to load consensus engine in pipe: %v"
,
e
)
}
tendermintPipe
,
err
:=
pipe
.
GetTendermintPipe
()
if
err
!=
nil
{
log
.
Warn
(
fmt
.
Sprintf
(
"Tendermint gateway not supported by %s"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment