feat(build): move grafana into grafana-server

pkg/cmd/grafana-server/main.go

@@ -0,0 +1,139 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/signal"
+	"path/filepath"
+	"runtime"
+	"strconv"
+	"syscall"
+	"time"
+
+	"github.com/grafana/grafana/pkg/log"
+	"github.com/grafana/grafana/pkg/login"
+	"github.com/grafana/grafana/pkg/metrics"
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/services/eventpublisher"
+	"github.com/grafana/grafana/pkg/services/notifications"
+	"github.com/grafana/grafana/pkg/services/search"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/social"
+)
+
+var version = "master"
+var commit = "NA"
+var buildstamp string
+var build_date string
+
+var configFile = flag.String("config", "", "path to config file")
+var homePath = flag.String("homepath", "", "path to grafana install/home path, defaults to working directory")
+var pidFile = flag.String("pidfile", "", "path to pid file")
+var exitChan = make(chan int)
+
+func init() {
+	runtime.GOMAXPROCS(runtime.NumCPU())
+}
+
+func main() {
+
+	v := flag.Bool("v", false, "prints current version and exits")
+	flag.Parse()
+	if *v {
+		fmt.Printf("Version %s (commit: %s)\n", version, commit)
+		os.Exit(0)
+	}
+
+	buildstampInt64, _ := strconv.ParseInt(buildstamp, 10, 64)
+
+	setting.BuildVersion = version
+	setting.BuildCommit = commit
+	setting.BuildStamp = buildstampInt64
+
+	go listenToSystemSignels()
+
+	flag.Parse()
+	writePIDFile()
+	initRuntime()
+
+	search.Init()
+	login.Init()
+	social.NewOAuthService()
+	eventpublisher.Init()
+	plugins.Init()
+
+	if err := notifications.Init(); err != nil {
+		log.Fatal(3, "Notification service failed to initialize", err)
+	}
+
+	if setting.ReportingEnabled {
+		go metrics.StartUsageReportLoop()
+	}
+
+	StartServer()
+	exitChan <- 0
+}
+
+func initRuntime() {
+	err := setting.NewConfigContext(&setting.CommandLineArgs{
+		Config:   *configFile,
+		HomePath: *homePath,
+		Args:     flag.Args(),
+	})
+
+	if err != nil {
+		log.Fatal(3, err.Error())
+	}
+
+	log.Info("Starting Grafana")
+	log.Info("Version: %v, Commit: %v, Build date: %v", setting.BuildVersion, setting.BuildCommit, time.Unix(setting.BuildStamp, 0))
+	setting.LogConfigurationInfo()
+
+	sqlstore.NewEngine()
+	sqlstore.EnsureAdminUser()
+}
+
+func writePIDFile() {
+	if *pidFile == "" {
+		return
+	}
+
+	// Ensure the required directory structure exists.
+	err := os.MkdirAll(filepath.Dir(*pidFile), 0700)
+	if err != nil {
+		log.Fatal(3, "Failed to verify pid directory", err)
+	}
+
+	// Retrieve the PID and write it.
+	pid := strconv.Itoa(os.Getpid())
+	if err := ioutil.WriteFile(*pidFile, []byte(pid), 0644); err != nil {
+		log.Fatal(3, "Failed to write pidfile", err)
+	}
+}
+
+func listenToSystemSignels() {
+	signalChan := make(chan os.Signal, 1)
+	code := 0
+
+	signal.Notify(signalChan, os.Interrupt)
+	signal.Notify(signalChan, os.Kill)
+	signal.Notify(signalChan, syscall.SIGTERM)
+
+	select {
+	case sig := <-signalChan:
+		log.Info("Received signal %s. shutting down", sig)
+	case code = <-exitChan:
+		switch code {
+		case 0:
+			log.Info("Shutting down")
+		default:
+			log.Warn("Shutting down")
+		}
+	}
+
+	log.Close()
+	os.Exit(code)
+}

pkg/cmd/grafana-server/web.go

@@ -0,0 +1,98 @@
+// 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"
+)
+
+func newMacaron() *macaron.Macaron {
+	macaron.Env = setting.Env
+	m := macaron.New()
+
+	m.Use(middleware.Logger())
+	m.Use(macaron.Recovery())
+
+	if setting.EnableGzip {
+		m.Use(middleware.Gziper())
+	}
+
+	for _, route := range plugins.StaticRoutes {
+		pluginRoute := path.Join("/public/plugins/", route.PluginId)
+		log.Info("Plugins: Adding route %s -> %s", pluginRoute, 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: "]]"},
+	}))
+
+	if setting.EnforceDomain {
+		m.Use(middleware.ValidateHostHeader(setting.Domain))
+	}
+
+	m.Use(middleware.GetContextHandler())
+	m.Use(middleware.Sessioner(&setting.SessionOptions))
+
+	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() {
+
+	var err error
+	m := newMacaron()
+	api.Register(m)
+
+	listenAddr := fmt.Sprintf("%s:%s", setting.HttpAddr, setting.HttpPort)
+	log.Info("Listen: %v://%s%s", setting.Protocol, listenAddr, 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:
+		log.Fatal(4, "Invalid protocol: %s", setting.Protocol)
+	}
+
+	if err != nil {
+		log.Fatal(4, "Fail to start server: %v", err)
+	}
+}