Progress on deb and rpm packaging, renamed config files, added file logging, #1476

pkg/cmd/common.go

@@ -1,13 +1,21 @@
 package cmd
 
 import (
+	"time"
+
 	"github.com/codegangsta/cli"
+	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/setting"
 )
 
 func initRuntime(c *cli.Context) {
 	setting.NewConfigContext(c.GlobalString("config"))
+
+	log.Info("Starting Grafana")
+	log.Info("Version: %v, Commit: %v, Build date: %v", setting.BuildVersion, setting.BuildCommit, time.Unix(setting.BuildStamp, 0))
+	setting.LogLoadedConfigFiles()
+
 	sqlstore.NewEngine()
 	sqlstore.EnsureAdminUser()
 }

pkg/cmd/web.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"net/http"
 	"path"
-	"time"
 
 	"github.com/Unknwon/macaron"
 	"github.com/codegangsta/cli"
@@ -68,9 +67,6 @@ func mapStatic(m *macaron.Macaron, dir string, prefix string) {
 }
 
 func runWeb(c *cli.Context) {
-	log.Info("Starting Grafana")
-	log.Info("Version: %v, Commit: %v, Build date: %v", setting.BuildVersion, setting.BuildCommit, time.Unix(setting.BuildStamp, 0))
-
 	initRuntime(c)
 
 	social.NewOAuthService()