diff --git a/CHANGELOG.md b/CHANGELOG.md index 580f23c7..65e0fa31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,8 @@ This release uses a new Raft consensus version, with the move to Hashicorp Raft - [PR #598](https://github.com/rqlite/rqlite/pull/598): Ensure backup is correctly closed. - [PR #600](https://github.com/rqlite/rqlite/pull/600): Move to Hashicorp Raft v1. - [PR #601](https://github.com/rqlite/rqlite/pull/601): By default use Raft network address as node ID. -- [PR #602](https://github.com/rqlite/rqlite/pull/602/files): Add method to Store that returns leader ID. +- [PR #602](https://github.com/rqlite/rqlite/pull/602): Add method to Store that returns leader ID. +- [PR #603](https://github.com/rqlite/rqlite/pull/603): Fix up status key name style. ## 4.6.0 (November 29th 2019) _This release adds significant new functionality to the command-line tool, including much more control over backup and restore of the database. [Visit the Releases page](https://github.com/rqlite/rqlite/releases/tag/v4.6.0) to download this release._ diff --git a/http/service.go b/http/service.go index c53fecdc..362ca07b 100644 --- a/http/service.go +++ b/http/service.go @@ -487,12 +487,12 @@ func (s *Service) handleStatus(w http.ResponseWriter, r *http.Request) { } rt := map[string]interface{}{ - "GOARCH": runtime.GOARCH, - "GOOS": runtime.GOOS, - "GOMAXPROCS": runtime.GOMAXPROCS(0), - "numCPU": runtime.NumCPU(), - "numGoroutine": runtime.NumGoroutine(), - "version": runtime.Version(), + "GOARCH": runtime.GOARCH, + "GOOS": runtime.GOOS, + "GOMAXPROCS": runtime.GOMAXPROCS(0), + "num_cpu": runtime.NumCPU(), + "num_goroutine": runtime.NumGoroutine(), + "version": runtime.Version(), } httpStatus := map[string]interface{}{ @@ -514,7 +514,7 @@ func (s *Service) handleStatus(w http.ResponseWriter, r *http.Request) { "node": nodeStatus, } if !s.lastBackup.IsZero() { - status["last_backup"] = s.lastBackup + status["last_backup_time"] = s.lastBackup } if s.BuildInfo != nil { status["build"] = s.BuildInfo