Merge pull request #667 from ThomasMeier/FD-869_fully_booted_diagnost…

…ics_API Add lastblockfromdbstate to diagnostics API
FactomProject · Mar 13, 2019 · 466bcaa · 466bcaa
2 parents d2e5799 + 56572d6
commit 466bcaa
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/common/interfaces/state.go b/common/interfaces/state.go
@@ -53,6 +53,7 @@ type IState interface {
 	GetFactomdVersion() string
 	GetDBHeightComplete() uint32
 	GetDBHeightAtBoot() uint32
+	GetDBFinished() bool
 	DatabaseContains(hash IHash) bool
 	SetOut(bool)  // Output is turned on if set to true
 	GetOut() bool // Return true if Print or Println write output

diff --git a/state/state.go b/state/state.go
@@ -2943,3 +2943,7 @@ func (s *State) IsActive(id activations.ActivationType) bool {
 
 	return rval
 }
+
+func (s *State) GetDBFinished() bool {
+	return s.DBFinished
+}
diff --git a/wsapi/wsapiStructs.go b/wsapi/wsapiStructs.go
@@ -318,9 +318,10 @@ type DiagnosticsResponse struct {
 	TempBalanceHash       string `json:"tempbalancehash"`
 	LastBlockFromDBState  bool   `json:"lastblockfromdbstate"`
 
-	SyncInfo     *SyncInfo     `json:"syncing"`
-	AuthSet      *AuthSet      `json:"authset"`
-	ElectionInfo *ElectionInfo `json:"elections"`
+	SyncInfo         *SyncInfo     `json:"syncing"`
+	BootFromDiskDone bool          `json:"bootfromdiskdone"`
+	AuthSet          *AuthSet      `json:"authset"`
+	ElectionInfo     *ElectionInfo `json:"elections"`
 }
 
 type SyncInfo struct {

diff --git a/wsapi/wsapiV2.go b/wsapi/wsapiV2.go
@@ -1402,6 +1402,7 @@ func HandleV2Diagnostics(state interfaces.IState, params interface{}) (interface
 	resp.BalanceHash = state.GetFactoidState().GetBalanceHash(false).String()
 	resp.TempBalanceHash = state.GetFactoidState().GetBalanceHash(true).String()
 	resp.LastBlockFromDBState = state.DidCreateLastBlockFromDBState()
+	resp.BootFromDiskDone = state.GetDBFinished()
 
 	feds := state.GetFedServers(resp.LeaderHeight)
 	fedCount := len(feds)