From: Sebastian Harl Date: Sun, 22 Feb 2015 18:25:26 +0000 (+0100) Subject: Include the remote server version on the index page. X-Git-Url: https://git.tokkee.org/?p=sysdb%2Fwebui.git;a=commitdiff_plain;h=09ea3e13e8c80150108b640c73e13656fa674af9 Include the remote server version on the index page. --- diff --git a/server/server.go b/server/server.go index 2b0c27e..093c683 100644 --- a/server/server.go +++ b/server/server.go @@ -216,7 +216,19 @@ func (s *Server) static(w http.ResponseWriter, req request) { } func index(_ request, s *Server) (*page, error) { - return &page{Content: "

Welcome to the System Database.

"}, nil + c := <-s.conns + defer func() { s.conns <- c }() + + major, minor, patch, extra, err := c.ServerVersion() + if err != nil { + return nil, err + } + + content := fmt.Sprintf("
"+ + "

Welcome to the System Database.

"+ + "

Connected to SysDB %d.%d.%d%s

"+ + "
", major, minor, patch, html(extra)) + return &page{Content: template.HTML(content)}, nil } func tmpl(t *template.Template, data interface{}) (*page, error) {