fix web
parent
60c71a98a4
commit
ba697f6ac9
1
etcd.go
1
etcd.go
|
@ -238,7 +238,6 @@ func main() {
|
|||
if argInfo.WebURL != "" {
|
||||
// start web
|
||||
argInfo.WebURL = checkURL(argInfo.WebURL, "http")
|
||||
etcdStore.SetMessager(storeMsg)
|
||||
go webHelper()
|
||||
go web.Start(raftServer, argInfo.WebURL)
|
||||
}
|
||||
|
|
1
util.go
1
util.go
|
@ -18,6 +18,7 @@ var storeMsg chan string
|
|||
// Help to send msg from store to webHub
|
||||
func webHelper() {
|
||||
storeMsg = make(chan string)
|
||||
etcdStore.SetMessager(storeMsg)
|
||||
for {
|
||||
// transfer the new msg to webHub
|
||||
web.Hub().Send(<-storeMsg)
|
||||
|
|
13
web/web.go
13
web/web.go
|
@ -9,8 +9,8 @@ import (
|
|||
"net/url"
|
||||
)
|
||||
|
||||
var s *raft.Server
|
||||
var mainTempl *template.Template
|
||||
var mainPage *MainPage
|
||||
|
||||
type MainPage struct {
|
||||
Leader string
|
||||
|
@ -18,9 +18,7 @@ type MainPage struct {
|
|||
}
|
||||
|
||||
func mainHandler(c http.ResponseWriter, req *http.Request) {
|
||||
|
||||
p := &MainPage{Leader: s.Leader(),
|
||||
Address: s.Name()}
|
||||
p := mainPage
|
||||
|
||||
mainTempl.Execute(c, p)
|
||||
}
|
||||
|
@ -35,7 +33,10 @@ func Start(raftServer *raft.Server, webURL string) {
|
|||
Addr: u.Host,
|
||||
}
|
||||
|
||||
s = raftServer
|
||||
mainPage = &MainPage{
|
||||
Leader: raftServer.Leader(),
|
||||
Address: u.Host,
|
||||
}
|
||||
|
||||
mainTempl = template.Must(template.New("index.html").Parse(index_html))
|
||||
|
||||
|
@ -43,7 +44,7 @@ func Start(raftServer *raft.Server, webURL string) {
|
|||
webMux.HandleFunc("/", mainHandler)
|
||||
webMux.Handle("/ws", websocket.Handler(wsHandler))
|
||||
|
||||
fmt.Printf("etcd web server listening on %s\n", u)
|
||||
fmt.Printf("etcd web server [%s] listening on %s\n", raftServer.Name(), u)
|
||||
|
||||
server.ListenAndServe()
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue