mirror of
https://github.com/lwch/natpass.git
synced 2024-04-21 12:41:54 +00:00
修正相对路径处理逻辑
This commit is contained in:
@@ -84,7 +84,7 @@ func LoadConf(dir string) *Configure {
|
||||
if cfg.Link.WriteTimeout <= 0 {
|
||||
cfg.Link.WriteTimeout = 5 * time.Second
|
||||
}
|
||||
if filepath.IsAbs(cfg.Log.Dir) {
|
||||
if !filepath.IsAbs(cfg.Log.Dir) {
|
||||
dir, err := os.Executable()
|
||||
runtime.Assert(err)
|
||||
cfg.Log.Dir = filepath.Join(filepath.Dir(dir), cfg.Log.Dir)
|
||||
|
||||
@@ -44,7 +44,7 @@ func LoadConf(dir string) *Configure {
|
||||
} `yaml:"tls"`
|
||||
}
|
||||
runtime.Assert(yaml.Decode(dir, &cfg))
|
||||
if filepath.IsAbs(cfg.Log.Dir) {
|
||||
if !filepath.IsAbs(cfg.Log.Dir) {
|
||||
dir, err := os.Executable()
|
||||
runtime.Assert(err)
|
||||
cfg.Log.Dir = filepath.Join(filepath.Dir(dir), cfg.Log.Dir)
|
||||
|
||||
Reference in New Issue
Block a user