luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Go fmt cleanup

This commit is contained in:
Paul Banks 2018-05-11 17:02:00 +01:00
parent 78d54a4be9
commit d35988521e
No known key found for this signature in database
GPG Key ID: C25A851A849B8221
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
agent/http.go
View File

@ -152,9 +152,9 @@ func (s *HTTPServer) handler(enableDebug bool) http.Handler {
if err != nil { if err != nil {
new_ui = false new_ui = false
} }
var uifs http.FileSystem; var uifs http.FileSystem
// Use the custom UI dir if provided. // Use the custom UI dir if provided.
if s.agent.config.UIDir != "" { if s.agent.config.UIDir != "" {
uifs = http.Dir(s.agent.config.UIDir) uifs = http.Dir(s.agent.config.UIDir)
} else { } else {
@ -164,14 +164,14 @@ func (s *HTTPServer) handler(enableDebug bool) http.Handler {
fs.Prefix += "/v2/" fs.Prefix += "/v2/"
} else { } else {
fs.Prefix += "/v1/" fs.Prefix += "/v1/"
} }
uifs = fs uifs = fs
} }
if new_ui { if new_ui {
uifs = &redirectFS{fs:uifs} uifs = &redirectFS{fs: uifs}
} }
mux.Handle("/ui/", http.StripPrefix("/ui/", http.FileServer(uifs))) mux.Handle("/ui/", http.StripPrefix("/ui/", http.FileServer(uifs)))
} }

1
lib/serf.go
View File

@ -23,6 +23,5 @@ func SerfDefaultConfig() *serf.Config {
// (using https://www.serf.io/docs/internals/simulator.html). // (using https://www.serf.io/docs/internals/simulator.html).
base.LeavePropagateDelay = 3 * time.Second base.LeavePropagateDelay = 3 * time.Second
return base return base
} }