aboutsummaryrefslogtreecommitdiff
path: root/weed/server/master_server_handlers_ui.go
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2017-07-03 22:35:28 -0700
committerChris Lu <chris.lu@gmail.com>2017-07-03 22:35:28 -0700
commitf9a1769df10dfd3f33c569af9cb27db1628e5159 (patch)
treea240a6a6c609752b486bdd06d156f2fc2a9c453a /weed/server/master_server_handlers_ui.go
parent1fbb8723dc414dc9b84bbaf84224b6f5829d34de (diff)
downloadseaweedfs-f9a1769df10dfd3f33c569af9cb27db1628e5159.tar.xz
seaweedfs-f9a1769df10dfd3f33c569af9cb27db1628e5159.zip
fix nil raft server caused crash
fix https://github.com/chrislusf/seaweedfs/issues/524
Diffstat (limited to 'weed/server/master_server_handlers_ui.go')
-rw-r--r--weed/server/master_server_handlers_ui.go17
1 files changed, 8 insertions, 9 deletions
diff --git a/weed/server/master_server_handlers_ui.go b/weed/server/master_server_handlers_ui.go
index 9ad234877..f241df87f 100644
--- a/weed/server/master_server_handlers_ui.go
+++ b/weed/server/master_server_handlers_ui.go
@@ -3,26 +3,25 @@ package weed_server
import (
"net/http"
+ "github.com/chrislusf/raft"
+ ui "github.com/chrislusf/seaweedfs/weed/server/master_ui"
"github.com/chrislusf/seaweedfs/weed/stats"
"github.com/chrislusf/seaweedfs/weed/util"
- ui "github.com/chrislusf/seaweedfs/weed/server/master_ui"
)
func (ms *MasterServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) {
infos := make(map[string]interface{})
infos["Version"] = util.VERSION
args := struct {
- Version string
- Topology interface{}
- Leader string
- Peers interface{}
- Stats map[string]interface{}
- Counters *stats.ServerStats
+ Version string
+ Topology interface{}
+ RaftServer raft.Server
+ Stats map[string]interface{}
+ Counters *stats.ServerStats
}{
util.VERSION,
ms.Topo.ToMap(),
- ms.Topo.RaftServer.Leader(),
- ms.Topo.RaftServer.Peers(),
+ ms.Topo.RaftServer,
infos,
serverStats,
}