diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2022-07-22 02:43:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-22 02:43:07 -0700 |
| commit | 8d97add89cddb316466776d875e9dc1419932ae6 (patch) | |
| tree | ff08269bbead68cb88f3e98f854cbefa165e4edf /weed/server | |
| parent | 7a6c559ab4a6b696bb574454b297ebefabec29ed (diff) | |
| parent | 58f2dd674061bb48f433abbebd604ba7a8fe1aa7 (diff) | |
| download | seaweedfs-8d97add89cddb316466776d875e9dc1419932ae6.tar.xz seaweedfs-8d97add89cddb316466776d875e9dc1419932ae6.zip | |
Merge pull request #3348 from ningfdx/remote
optimiz: master ui will render data in order
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/master_server_handlers_admin.go | 2 | ||||
| -rw-r--r-- | weed/server/master_server_handlers_ui.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/weed/server/master_server_handlers_admin.go b/weed/server/master_server_handlers_admin.go index 47abfb892..0c85db791 100644 --- a/weed/server/master_server_handlers_admin.go +++ b/weed/server/master_server_handlers_admin.go @@ -48,7 +48,7 @@ func (ms *MasterServer) collectionDeleteHandler(w http.ResponseWriter, r *http.R func (ms *MasterServer) dirStatusHandler(w http.ResponseWriter, r *http.Request) { m := make(map[string]interface{}) m["Version"] = util.Version() - m["Topology"] = ms.Topo.ToMap() + m["Topology"] = ms.Topo.ToInfo() writeJsonQuiet(w, r, http.StatusOK, m) } diff --git a/weed/server/master_server_handlers_ui.go b/weed/server/master_server_handlers_ui.go index d8260d8d2..f09022399 100644 --- a/weed/server/master_server_handlers_ui.go +++ b/weed/server/master_server_handlers_ui.go @@ -26,7 +26,7 @@ func (ms *MasterServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) VolumeSizeLimitMB uint32 }{ util.Version(), - ms.Topo.ToMap(), + ms.Topo.ToInfo(), ms.Topo.RaftServer, infos, serverStats, @@ -43,7 +43,7 @@ func (ms *MasterServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) VolumeSizeLimitMB uint32 }{ util.Version(), - ms.Topo.ToMap(), + ms.Topo.ToInfo(), ms.Topo.HashicorpRaft, infos, serverStats, |