github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

agent: inline uiDir field 

uiDir can be inlined as agent.config.UIDir
pull/3037/head
Frank Schroeder 2017-05-11 19:31:58 +02:00
parent 8f381d62f6
commit 327401e7ee
No known key found for this signature in database
GPG Key ID: 4D65C6EAEC87DECD
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
command/agent/http.go
View File

@ -27,7 +27,6 @@ type HTTPServer struct {
mux *http.ServeMux
listener net.Listener
logger *log.Logger
uiDir string
addr string
}
@ -80,7 +79,6 @@ func NewHTTPServers(agent *Agent) ([]*HTTPServer, error) {
mux: mux,
listener: list,
logger: log.New(logOutput, "", log.LstdFlags),
uiDir: config.UIDir,
addr: httpAddr.String(),
}
srv.registerHandlers(config.EnableDebug)
@ -132,7 +130,6 @@ func NewHTTPServers(agent *Agent) ([]*HTTPServer, error) {
mux: mux,
listener: list,
logger: log.New(logOutput, "", log.LstdFlags),
uiDir: config.UIDir,
addr: httpAddr.String(),
}
srv.registerHandlers(config.EnableDebug)
@ -293,8 +290,8 @@ func (s *HTTPServer) registerHandlers(enableDebug bool) {
}
// Use the custom UI dir if provided.
if s.uiDir != "" {
s.mux.Handle("/ui/", http.StripPrefix("/ui/", http.FileServer(http.Dir(s.uiDir))))
if s.agent.config.UIDir != "" {
s.mux.Handle("/ui/", http.StripPrefix("/ui/", http.FileServer(http.Dir(s.agent.config.UIDir))))
} else if s.agent.config.EnableUI {
s.mux.Handle("/ui/", http.StripPrefix("/ui/", http.FileServer(assetFS())))
}
@ -391,7 +388,7 @@ func (s *HTTPServer) marshalJSON(req *http.Request, obj interface{}) ([]byte, er
// Returns true if the UI is enabled.
func (s *HTTPServer) IsUIEnabled() bool {
return s.uiDir != "" || s.agent.config.EnableUI
return s.agent.config.UIDir != "" || s.agent.config.EnableUI
}
// Renders a simple index page

2
command/agent/ui_endpoint_test.go
View File

@ -33,7 +33,7 @@ func TestUiIndex(t *testing.T) {
defer srv.agent.Shutdown()
// Create file
path := filepath.Join(srv.uiDir, "my-file")
path := filepath.Join(srv.agent.config.UIDir, "my-file")
if err := ioutil.WriteFile(path, []byte("test"), 777); err != nil {
t.Fatalf("err: %v", err)
}