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