before macaron

pkg/api/api_logger.go

@@ -53,11 +53,10 @@ func apiLogger() gin.HandlerFunc {
 
 
 		end := time.Now()
 		end := time.Now()
 		latency := end.Sub(start)
 		latency := end.Sub(start)
-		log.Info("[http] %s %s %3d %12v %s %s",
+		log.Info("[http] %s %s %3d %12v %s",
 			c.Request.Method, c.Request.URL.Path,
 			c.Request.Method, c.Request.URL.Path,
 			code,
 			code,
 			latency,
 			latency,
-			requester,
 			c.Errors.String(),
 			c.Errors.String(),
 		)
 		)
 	}
 	}

pkg/cmd/web.go

 package cmd
 package cmd
 
 
 import (
 import (
-	"os"
 	"time"
 	"time"
 
 
 	"github.com/codegangsta/cli"
 	"github.com/codegangsta/cli"
 	"github.com/siddontang/go-log/log"
 	"github.com/siddontang/go-log/log"
 	"github.com/torkelo/grafana-pro/pkg/configuration"
 	"github.com/torkelo/grafana-pro/pkg/configuration"
-	"github.com/torkelo/grafana-pro/pkg/routes"
 	"github.com/torkelo/grafana-pro/pkg/server"
 	"github.com/torkelo/grafana-pro/pkg/server"
+	"github.com/torkelo/grafana-pro/pkg/setting"
 )
 )
 
 
 var CmdWeb = cli.Command{
 var CmdWeb = cli.Command{
@@ -20,15 +19,11 @@ var CmdWeb = cli.Command{
 }
 }
 
 
 func runWeb(*cli.Context) {
 func runWeb(*cli.Context) {
-	routes.GlobalInit()
-	port := os.Getenv("PORT")
-	if port == "" {
-		port = "3838"
-	}
-
 	log.Info("Starting Grafana-Pro v.1-alpha")
 	log.Info("Starting Grafana-Pro v.1-alpha")
 
 
-	cfg := configuration.NewCfg(port)
+	setting.NewConfigContext()
+
+	cfg := configuration.NewCfg(setting.HttpPort)
 	server, err := server.NewServer(cfg)
 	server, err := server.NewServer(cfg)
 	if err != nil {
 	if err != nil {
 		time.Sleep(time.Second)
 		time.Sleep(time.Second)

pkg/setting/setting.go

@@ -122,4 +122,9 @@ func NewConfigContext() {
 	Domain = Cfg.MustValue("server", "domain", "localhost")
 	Domain = Cfg.MustValue("server", "domain", "localhost")
 	HttpAddr = Cfg.MustValue("server", "http_addr", "0.0.0.0")
 	HttpAddr = Cfg.MustValue("server", "http_addr", "0.0.0.0")
 	HttpPort = Cfg.MustValue("server", "http_port", "3000")
 	HttpPort = Cfg.MustValue("server", "http_port", "3000")
+
+	port := os.Getenv("PORT")
+	if port != "" {
+		HttpPort = port
+	}
 }
 }