refactor(http): refactoring http server

pkg/cmd/grafana-server/server.go

@@ -2,13 +2,9 @@ package main
 
 import (
 	"context"
-	"fmt"
-	"net/http"
 	"os"
 	"time"
 
-	"gopkg.in/macaron.v1"
-
 	"golang.org/x/sync/errgroup"
 
 	"github.com/grafana/grafana/pkg/api"
@@ -78,24 +74,9 @@ func (g *GrafanaServerImpl) Start() {
 }
 
 func (g *GrafanaServerImpl) startHttpServer() {
-	logger = log.New("http.server")
+	httpServer := api.NewHttpServer()
 
-	var err error
-	m := newMacaron()
-	api.Register(m)
-
-	listenAddr := fmt.Sprintf("%s:%s", setting.HttpAddr, setting.HttpPort)
-	g.log.Info("Initializing HTTP Server", "address", listenAddr, "protocol", setting.Protocol, "subUrl", setting.AppSubUrl)
-
-	switch setting.Protocol {
-	case setting.HTTP:
-		err = http.ListenAndServe(listenAddr, m)
-	case setting.HTTPS:
-		err = ListenAndServeTLS(listenAddr, setting.CertFile, setting.KeyFile, m)
-	default:
-		g.log.Error("Invalid protocol", "protocol", setting.Protocol)
-		g.Shutdown(1, "Startup failed")
-	}
+	err := httpServer.Start(g.context)
 
 	if err != nil {
 		g.log.Error("Fail to start server", "error", err)
@@ -115,26 +96,6 @@ func (g *GrafanaServerImpl) Shutdown(code int, reason string) {
 	os.Exit(code)
 }
 
-func ListenAndServeTLS(listenAddr, certfile, keyfile string, m *macaron.Macaron) error {
-	if certfile == "" {
-		return fmt.Errorf("cert_file cannot be empty when using HTTPS")
-	}
-
-	if keyfile == "" {
-		return fmt.Errorf("cert_key cannot be empty when using HTTPS")
-	}
-
-	if _, err := os.Stat(setting.CertFile); os.IsNotExist(err) {
-		return fmt.Errorf(`Cannot find SSL cert_file at %v`, setting.CertFile)
-	}
-
-	if _, err := os.Stat(setting.KeyFile); os.IsNotExist(err) {
-		return fmt.Errorf(`Cannot find SSL key_file at %v`, setting.KeyFile)
-	}
-
-	return http.ListenAndServeTLS(listenAddr, setting.CertFile, setting.KeyFile, m)
-}
-
 // implement context.Context
 func (g *GrafanaServerImpl) Deadline() (deadline time.Time, ok bool) {
 	return g.context.Deadline()

pkg/cmd/grafana-server/web.go

@@ -1,107 +0,0 @@
-// Copyright 2014 Unknwon
-// Copyright 2014 Torkel Ödegaard
-
-package main
-
-import (
-	"fmt"
-	"net/http"
-	"path"
-
-	"gopkg.in/macaron.v1"
-
-	"github.com/grafana/grafana/pkg/api"
-	"github.com/grafana/grafana/pkg/api/static"
-	"github.com/grafana/grafana/pkg/log"
-	"github.com/grafana/grafana/pkg/middleware"
-	"github.com/grafana/grafana/pkg/plugins"
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-var logger log.Logger
-
-func newMacaron() *macaron.Macaron {
-	macaron.Env = setting.Env
-	m := macaron.New()
-
-	m.Use(middleware.Logger())
-	m.Use(middleware.Recovery())
-
-	if setting.EnableGzip {
-		m.Use(middleware.Gziper())
-	}
-
-	for _, route := range plugins.StaticRoutes {
-		pluginRoute := path.Join("/public/plugins/", route.PluginId)
-		logger.Debug("Plugins: Adding route", "route", pluginRoute, "dir", route.Directory)
-		mapStatic(m, route.Directory, "", pluginRoute)
-	}
-
-	mapStatic(m, setting.StaticRootPath, "", "public")
-	mapStatic(m, setting.StaticRootPath, "robots.txt", "robots.txt")
-
-	m.Use(macaron.Renderer(macaron.RenderOptions{
-		Directory:  path.Join(setting.StaticRootPath, "views"),
-		IndentJSON: macaron.Env != macaron.PROD,
-		Delims:     macaron.Delims{Left: "[[", Right: "]]"},
-	}))
-
-	m.Use(middleware.GetContextHandler())
-	m.Use(middleware.Sessioner(&setting.SessionOptions))
-	m.Use(middleware.RequestMetrics())
-
-	// needs to be after context handler
-	if setting.EnforceDomain {
-		m.Use(middleware.ValidateHostHeader(setting.Domain))
-	}
-
-	return m
-}
-
-func mapStatic(m *macaron.Macaron, rootDir string, dir string, prefix string) {
-	headers := func(c *macaron.Context) {
-		c.Resp.Header().Set("Cache-Control", "public, max-age=3600")
-	}
-
-	if setting.Env == setting.DEV {
-		headers = func(c *macaron.Context) {
-			c.Resp.Header().Set("Cache-Control", "max-age=0, must-revalidate, no-cache")
-		}
-	}
-
-	m.Use(httpstatic.Static(
-		path.Join(rootDir, dir),
-		httpstatic.StaticOptions{
-			SkipLogging: true,
-			Prefix:      prefix,
-			AddHeaders:  headers,
-		},
-	))
-}
-
-func StartServer() int {
-	logger = log.New("server")
-
-	var err error
-	m := newMacaron()
-	api.Register(m)
-
-	listenAddr := fmt.Sprintf("%s:%s", setting.HttpAddr, setting.HttpPort)
-	logger.Info("Server Listening", "address", listenAddr, "protocol", setting.Protocol, "subUrl", setting.AppSubUrl)
-	switch setting.Protocol {
-	case setting.HTTP:
-		err = http.ListenAndServe(listenAddr, m)
-	case setting.HTTPS:
-		err = http.ListenAndServeTLS(listenAddr, setting.CertFile, setting.KeyFile, m)
-	default:
-		logger.Error("Invalid protocol", "protocol", setting.Protocol)
-		return 1
-	}
-
-	if err != nil {
-		logger.Error("Fail to start server", "error", err)
-		return 1
-	}
-
-	return 0
-}