grim/hgkeeper

Remove unused environment variable

12 months ago, aklitzing
cc7d4b7251eb
Remove unused environment variable

It is not necessary since c10e152f5523.

Reviewed at https://reviews.imfreedom.org/r/2447/
package http
import (
"net/http"
"path/filepath"
"go.uber.org/zap"
"keep.imfreedom.org/grim/hgkeeper/hg"
"keep.imfreedom.org/grim/hgkeeper/hgweb"
)
type Server struct {
listenAddr string
server *http.Server
hgw *hgweb.HGWeb
externalHostname string
externalPort string
}
func NewServer(listenAddr string, disableHGWeb bool, externalHostname, externalPort string) (*Server, error) {
s := &Server{
listenAddr: listenAddr,
server: &http.Server{
Addr: listenAddr,
},
externalHostname: externalHostname,
externalPort: externalPort,
}
if !disableHGWeb {
s.hgw = hgweb.New()
}
return s, nil
}
func (s *Server) Listen() error {
templatesDir, err := hg.TemplatesDir()
if err != nil {
return err
}
staticPath := filepath.Join(templatesDir, "static")
zap.S().Infof("serving static files from %s", staticPath)
fileServer := http.FileServer(http.Dir(staticPath))
mux := http.NewServeMux()
mux.HandleFunc("/hgk/health", healthHandler)
if s.externalHostname != "" {
mux.Handle("/hgk/authorized_keys", authorizedKeysHandler(s.externalHostname, s.externalPort))
zap.S().Infof("added /hgk/authorized_keys endpoint with external hostname %s and export port %s", s.externalHostname, s.externalPort)
} else {
zap.S().Infof("no external hostname specified, not adding /hgk/authorized_keys endpoint")
}
mux.Handle("/static/", http.StripPrefix("/static", fileServer))
if s.hgw != nil {
zap.S().Infof("enabling HGWeb CGI server")
hgwHandler, err := s.hgw.Handler()
if err != nil {
return err
}
mux.Handle("/", hgwHandler)
} else {
zap.S().Infof("not enabling HGWeb CGI server as requested")
}
s.server.Handler = Logger(mux)
zap.S().Infof("http listening on %s", s.listenAddr)
return s.server.ListenAndServe()
}
func (s *Server) Close() {
if s.hgw != nil {
if err := s.hgw.Close(); err != nil {
zap.S().Warnf("failed to close hgweb: %v", err)
}
}
if err := s.server.Close(); err != nil {
zap.S().Warnf("failed to shutdown http server: %v", err)
}
}