Mirror
/
seaweedfs
mirror of https://github.com/seaweedfs/seaweedfs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix nil raft server caused crash 

fix https://github.com/chrislusf/seaweedfs/issues/524
pull/533/head
Chris Lu 8 years ago
parent
1fbb8723dc
commit
f9a1769df1
2 changed files with 10 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      weed/server/master_server_handlers_ui.go
  2. 2
      weed/server/master_ui/templates.go

17
weed/server/master_server_handlers_ui.go
View File

@ -3,26 +3,25 @@ package weed_server
import ( import (
"net/http" "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/stats"
"github.com/chrislusf/seaweedfs/weed/util" "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) { func (ms *MasterServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) {
infos := make(map[string]interface{}) infos := make(map[string]interface{})
infos["Version"] = util.VERSION infos["Version"] = util.VERSION
args := struct { 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, util.VERSION,
ms.Topo.ToMap(), ms.Topo.ToMap(),
ms.Topo.RaftServer.Leader(),
ms.Topo.RaftServer.Peers(),
ms.Topo.RaftServer,
infos, infos,
serverStats, serverStats,
} }

2
weed/server/master_ui/templates.go
View File

@ -33,6 +33,7 @@ var StatusTpl = template.Must(template.New("status").Parse(`<!DOCTYPE html>
<th>Max</th> <th>Max</th>
<td>{{ .Topology.Max }}</td> <td>{{ .Topology.Max }}</td>
</tr> </tr>
{{ with .RaftServer }}
<tr> <tr>
<th>Leader</th> <th>Leader</th>
<td><a href="http://{{ .Leader }}">{{ .Leader }}</a></td> <td><a href="http://{{ .Leader }}">{{ .Leader }}</a></td>
@ -45,6 +46,7 @@ var StatusTpl = template.Must(template.New("status").Parse(`<!DOCTYPE html>
{{ end }} {{ end }}
</ul></td> </ul></td>
</tr> </tr>
{{ end }}
</tbody> </tbody>
</table> </table>
</div> </div>

Write Preview
Loading…
Cancel
Save