Fix default path loading under windows

beehive.go

@@ -110,7 +110,7 @@ func main() {
 		if err != nil {
 			log.Fatalf("Error loading configuration file from %s. err: %v", config.URL(), err)
 		}
-		log.Infof("Loading configuration from %s", config.URL())
+		log.Infof("Loading configuration from %s", config.URL().Raw)
 	} else { // try to load default config from user paths
 		path := cfg.Lookup()
 		if path == "" {

cfg/config.go

@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"runtime"
+	"strings"
 
 	"github.com/muesli/beehive/bees"
 	gap "github.com/muesli/go-app-paths"
@@ -157,7 +158,7 @@ func DefaultPath() string {
 		return cfgFileName
 	}
 
-	return path
+	return fixWindowsPath(path)
 }
 
 // Lookup tries to find the config file.
@@ -205,3 +206,13 @@ func exist(file string) bool {
 
 	return false
 }
+
+// Replace backward slashes in Windows paths with /, to make them suitable
+// for Go URL parsing.
+func fixWindowsPath(path string) string {
+	if runtime.GOOS == "windows" {
+		return strings.Replace(path, `\`, "/", -1)
+	}
+
+	return path
+}

cfg/helpers_test.go

@@ -4,20 +4,8 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"runtime"
-	"strings"
 )
 
-// Replace backward slashes in Windows paths with /, to make them suitable
-// for Go URL parsing.
-func fixWindowsPath(path string) string {
-	if runtime.GOOS == "windows" {
-		return strings.Replace(path, `\`, "/", -1)
-	}
-
-	return path
-}
-
 func encryptedConfPath() string {
 	cwd, _ := os.Getwd()
 	return fixWindowsPath(filepath.Join(cwd, "testdata", "beehive-crypto.conf"))