diff --git a/config_center/file/impl.go b/config_center/file/impl.go
index 9afe7c6524ab02d368f91283e39e3e4c1deacbac..6489a073deff643ad7eecc7f3c26ef0b8899ac53 100644
--- a/config_center/file/impl.go
+++ b/config_center/file/impl.go
@@ -24,7 +24,6 @@ import (
"os"
"os/exec"
"os/user"
- "path"
"path/filepath"
"runtime"
"strings"
@@ -41,11 +40,19 @@ import (
"github.com/apache/dubbo-go/config_center/parser"
)
+var (
+ osType = runtime.GOOS
+)
+
+const (
+ windowsOS = "windows"
+)
+
const (
- PARAM_NAME_PREFIX = "dubbo.config-center."
- CONFIG_CENTER_DIR_PARAM_NAME = PARAM_NAME_PREFIX + "dir"
- CONFIG_CENTER_ENCODING_PARAM_NAME = PARAM_NAME_PREFIX + "encoding"
- DEFAULT_CONFIG_CENTER_ENCODING = "UTF-8"
+ ParamNamePrefix = "dubbo.config-center."
+ ConfigCenterDirParamName = ParamNamePrefix + "dir"
+ ConfigCenterEncodingParamName = ParamNamePrefix + "encoding"
+ defaultConfigCenterEncoding = "UTF-8"
)
// FileSystemDynamicConfiguration
@@ -59,24 +66,14 @@ type FileSystemDynamicConfiguration struct {
}
func newFileSystemDynamicConfiguration(url *common.URL) (*FileSystemDynamicConfiguration, error) {
- encode := url.GetParam(CONFIG_CENTER_ENCODING_PARAM_NAME, DEFAULT_CONFIG_CENTER_ENCODING)
+ encode := url.GetParam(ConfigCenterEncodingParamName, defaultConfigCenterEncoding)
- root := url.GetParam(CONFIG_CENTER_DIR_PARAM_NAME, "")
+ root := url.GetParam(ConfigCenterDirParamName, "")
var c *FileSystemDynamicConfiguration
- if _, err := os.Stat(root); err != nil {
- // not exist, use default, /XXX/xx/.dubbo/config-center
- if rp, err := Home(); err != nil {
- return nil, perrors.WithStack(err)
- } else {
- root = path.Join(rp, ".dubbo", "config-center")
- }
- }
- if _, err := os.Stat(root); err != nil {
- // it must be dir, if not exist, will create
- if err = createDir(root); err != nil {
- return nil, perrors.WithStack(err)
- }
+ root, err := mkdirIfNecessary(root)
+ if err != nil {
+ return nil, err
}
c = &FileSystemDynamicConfiguration{
@@ -195,18 +192,18 @@ func (fsdc *FileSystemDynamicConfiguration) Close() error {
// GetPath get path
func (fsdc *FileSystemDynamicConfiguration) GetPath(key string, group string) string {
if len(key) == 0 {
- return path.Join(fsdc.rootPath, group)
+ return filepath.Join(fsdc.rootPath, group)
}
if len(group) == 0 {
group = config_center.DEFAULT_GROUP
}
- return path.Join(fsdc.rootPath, group, key)
+ return filepath.Join(fsdc.rootPath, group, adapterKey(key))
}
func (fsdc *FileSystemDynamicConfiguration) deleteDelay(path string) (bool, error) {
- if path == "" {
+ if len(path) == 0 {
return false, nil
}
@@ -226,9 +223,7 @@ func (fsdc *FileSystemDynamicConfiguration) write2File(fp string, value string)
}
func forceMkdirParent(fp string) error {
- pd := getParentDirectory(fp)
-
- return createDir(pd)
+ return createDir(getParentDirectory(fp))
}
func createDir(path string) error {
@@ -250,6 +245,7 @@ func substr(s string, pos, length int) string {
if l > len(runes) {
l = len(runes)
}
+
return string(runes[pos:l])
}
@@ -264,7 +260,7 @@ func Home() (string, error) {
}
// cross compile support
- if "windows" == runtime.GOOS {
+ if windowsOS == osType {
return homeWindows()
}
@@ -287,7 +283,7 @@ func homeUnix() (string, error) {
}
result := strings.TrimSpace(stdout.String())
- if result == "" {
+ if len(result) == 0 {
return "", errors.New("blank output when reading home directory")
}
@@ -298,12 +294,66 @@ func homeWindows() (string, error) {
drive := os.Getenv("HOMEDRIVE")
homePath := os.Getenv("HOMEPATH")
home := drive + homePath
- if drive == "" || homePath == "" {
+ if len(drive) == 0 || len(homePath) == 0 {
home = os.Getenv("USERPROFILE")
}
- if home == "" {
+ if len(home) == 0 {
return "", errors.New("HOMEDRIVE, HOMEPATH, and USERPROFILE are blank")
}
return home, nil
}
+
+func mkdirIfNecessary(urlRoot string) (string, error) {
+ if !legalPath(urlRoot) {
+ // not exist, use default, mac is: /XXX/xx/.dubbo/config-center
+ rp, err := Home()
+ if err != nil {
+ return "", perrors.WithStack(err)
+ }
+
+ urlRoot = adapterUrl(rp)
+ }
+
+ if _, err := os.Stat(urlRoot); err != nil {
+ // it must be dir, if not exist, will create
+ if err = createDir(urlRoot); err != nil {
+ return "", perrors.WithStack(err)
+ }
+ }
+
+ return urlRoot, nil
+}
+
+func legalPath(path string) bool {
+ if len(path) == 0 {
+ return false
+ }
+ if _, err := os.Stat(path); err != nil {
+ return false
+ }
+
+ return true
+}
+
+func adapterUrl(rp string) string {
+ if osType == windowsOS {
+ return filepath.Join(rp, "_dubbo", "config-center")
+ }
+
+ return filepath.Join(rp, ".dubbo", "config-center")
+}
+
+// used for GetPath. param key default is instance's id.
+// e.g: (ip:port) 127.0.0.1:20081, in windows env, will change to 127_0_0_1_20081
+func adapterKey(key string) string {
+ if len(key) == 0 {
+ return ""
+ }
+
+ if osType == windowsOS {
+ return strings.ReplaceAll(strings.ReplaceAll(key, ".", "_"), ":", "_")
+ }
+
+ return key
+}
diff --git a/go.mod b/go.mod
index 0e5736c0a8afd6352f3b9f0e30d2fa368c767312..18d85a650f27430f163b78f3bba92236c1a3b524 100644
--- a/go.mod
+++ b/go.mod
@@ -1,7 +1,5 @@
module github.com/apache/dubbo-go
-go 1.15
-
require (
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/RoaringBitmap/roaring v0.5.5
@@ -9,7 +7,7 @@ require (
github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5
github.com/alibaba/sentinel-golang v1.0.1
github.com/apache/dubbo-getty v1.4.1
- github.com/apache/dubbo-go-hessian2 v1.8.0
+ github.com/apache/dubbo-go-hessian2 v1.8.2
github.com/coreos/etcd v3.3.25+incompatible
github.com/creasty/defaults v1.5.1
github.com/dubbogo/go-zookeeper v1.0.2
diff --git a/go.sum b/go.sum
index bc0b1ec8bf5e0e7e96531e57522f1238a53451a5..2c07089b681b1944ae8fd33fac7dbf18857d7155 100644
--- a/go.sum
+++ b/go.sum
@@ -62,7 +62,6 @@ github.com/RoaringBitmap/roaring v0.5.5 h1:naNqvO1mNnghk2UvcsqnzHDBn9DRbCIRy94Gm
github.com/RoaringBitmap/roaring v0.5.5/go.mod h1:puNo5VdzwbaIQxSiDIwfXl4Hnc+fbovcX4IW/dSTtUk=
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
-github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8=
github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
@@ -84,8 +83,8 @@ github.com/aliyun/alibaba-cloud-sdk-go v1.61.18 h1:zOVTBdCKFd9JbCKz9/nt+FovbjPFm
github.com/aliyun/alibaba-cloud-sdk-go v1.61.18/go.mod h1:v8ESoHo4SyHmuB4b1tJqDHxfTGEciD+yhvOU/5s1Rfk=
github.com/apache/dubbo-getty v1.4.1 h1:M9yaFhemThQSWtRwmJNrxNuv7FzydlFx5EY8oq1v+lw=
github.com/apache/dubbo-getty v1.4.1/go.mod h1:ansXgKxxyhCOiQL29nO5ce1MDcEKmCyZuNR9oMs3hek=
-github.com/apache/dubbo-go-hessian2 v1.8.0 h1:+GJQHxWd/WUw2p4hbfCal/zjKvGVb8yJZzOke8IEazc=
-github.com/apache/dubbo-go-hessian2 v1.8.0/go.mod h1:7rEw9guWABQa6Aqb8HeZcsYPHsOS7XT1qtJvkmI6c5w=
+github.com/apache/dubbo-go-hessian2 v1.8.2 h1:CQq2Mmlrk6Fqmudwl9Dqps8drTrBFnmXRlzgOjj0FqA=
+github.com/apache/dubbo-go-hessian2 v1.8.2/go.mod h1:xQUjE7F8PX49nm80kChFvepA/AvqAZ0oh/UaB6+6pBE=
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA=
@@ -234,7 +233,6 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
-github.com/go-ole/go-ole v1.2.1 h1:2lOsA72HgjxAuMlKpFiCbHTvu44PIVkZ5hqm3RSdI/E=
github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8=
github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
diff --git a/registry/file/service_discovery.go b/registry/file/service_discovery.go
index c3b77f6849c7566496d1b8e6f900dd48ac128b8a..768a1c2a3d8a208d637e374632da530a43465a4e 100644
--- a/registry/file/service_discovery.go
+++ b/registry/file/service_discovery.go
@@ -69,7 +69,7 @@ func newFileSystemServiceDiscovery(name string) (registry.ServiceDiscovery, erro
fdcf := extension.GetConfigCenterFactory(constant.FILE_KEY)
p := path.Join(rp, ".dubbo", constant.REGISTRY_KEY)
url, _ := common.NewURL("")
- url.AddParamAvoidNil(file.CONFIG_CENTER_DIR_PARAM_NAME, p)
+ url.AddParamAvoidNil(file.ConfigCenterDirParamName, p)
c, err := fdcf.GetDynamicConfiguration(url)
if err != nil {
return nil, perrors.WithStack(err)