Merge branch 'master' of github.com:torkelo/grafana-pro

Conflicts:
	.bra.toml

.bra.toml

 [run]
 [run]
-init_cmds = [["./grafana-pro", "web"]]
+init_cmds = [["./bin/grafana", "web"]]
 watch_all = true
 watch_all = true
 watch_dirs = [
 watch_dirs = [
 	"$WORKDIR/pkg",
 	"$WORKDIR/pkg",
@@ -9,6 +9,6 @@ watch_dirs = [
 watch_exts = [".go", ".ini"]
 watch_exts = [".go", ".ini"]
 build_delay = 1500
 build_delay = 1500
 cmds = [
 cmds = [
-	["go", "build"],
-	["./grafana-pro", "web"]
+	["make", "build"],
+	["./bin/grafana", "web"]
 ]
 ]

.gitignore

@@ -17,4 +17,4 @@ config.js
 data/sessions
 data/sessions
 data/*.db
 data/*.db
 data/log
 data/log
-/grafana-pro
+/bin/*

Makefile

@@ -3,7 +3,7 @@
 all: build
 all: build
 
 
 build:
 build:
-	go build ../pkg/cmd/grafana-pro/
+	go build -o bin/grafana .
 
 
 setup:
 setup:
 	go get github.com/tools/godep
 	go get github.com/tools/godep

grafana @ 373118c5

-Subproject commit 79beefe57c608b3cd933c5b1f772c8707731a64c
+Subproject commit 373118c5eecc5c3645254cb4b862124b55dae980

pkg/setting/setting.go

@@ -6,7 +6,6 @@ package setting
 import (
 import (
 	"net/url"
 	"net/url"
 	"os"
 	"os"
-	"os/exec"
 	"path"
 	"path"
 	"path/filepath"
 	"path/filepath"
 	"runtime"
 	"runtime"
@@ -69,18 +68,8 @@ func init() {
 	log.NewLogger(0, "console", `{"level": 0}`)
 	log.NewLogger(0, "console", `{"level": 0}`)
 }
 }
 
 
-// WorkDir returns absolute path of work directory.
 func WorkDir() (string, error) {
 func WorkDir() (string, error) {
-	execPath, err := ExecPath()
-	return path.Dir(strings.Replace(execPath, "\\", "/", -1)), err
-}
-
-func ExecPath() (string, error) {
-	file, err := exec.LookPath(os.Args[0])
-	if err != nil {
-		return "", err
-	}
-	p, err := filepath.Abs(file)
+	p, err := filepath.Abs(".")
 	if err != nil {
 	if err != nil {
 		return "", err
 		return "", err
 	}
 	}
@@ -96,7 +85,7 @@ func NewConfigContext() {
 
 
 	Cfg, err = goconfig.LoadConfigFile(path.Join(workDir, "conf/grafana.ini"))
 	Cfg, err = goconfig.LoadConfigFile(path.Join(workDir, "conf/grafana.ini"))
 	if err != nil {
 	if err != nil {
-		log.Fatal(4, "Fail to parse 'conf/grafana.ini': %v", err)
+		log.Fatal(4, "Fail to parse '%v/conf/grafana.ini': %v", workDir, err)
 	}
 	}
 
 
 	CustomPath = os.Getenv("GRAFANA_CONF")
 	CustomPath = os.Getenv("GRAFANA_CONF")