From 1b99ed0d08dd117d860f293291a494aad0af7a02 Mon Sep 17 00:00:00 2001 From: zhaofukai Date: Thu, 1 Aug 2019 12:32:47 +0800 Subject: [PATCH] Fix: fix perfcounter.json and exec file in the same directory --- config.go | 14 +++++++++++--- version.go | 5 ++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/config.go b/config.go index 98fff71..3cbea25 100644 --- a/config.go +++ b/config.go @@ -5,6 +5,7 @@ import ( "fmt" "io/ioutil" "os" + "path/filepath" "strings" "sync" ) @@ -28,7 +29,8 @@ type PushConfig struct { } var ( - configFn = "./perfcounter.json" + configFile = "perfcounter.json" + configFn = "./" + configFile defaultTags = "" defaultStep = int64(60) //time in sec defaultBases = []string{} @@ -50,9 +52,15 @@ func config() *GlobalConfig { func loadConfig() error { if !isFileExist(configFn) { - return fmt.Errorf("config file not found: %s", configFn) + execPath, err := filepath.Abs(filepath.Dir(os.Args[0])) + if err != nil { + return fmt.Errorf("get exec path err: %s", err.Error()) + } + configFn = filepath.Join(execPath, configFile) + if !isFileExist(configFn) { + return fmt.Errorf("config file not found: %s", configFn) + } } - c, err := parseConfig(configFn) if err != nil { return err diff --git a/version.go b/version.go index 378d1ed..68960df 100644 --- a/version.go +++ b/version.go @@ -1,7 +1,10 @@ package goperfcounter // changelog: + +// 0.0.2: Fix perfcounter.json and exec file in the same directory + // 0.0.1: init project const ( - VERSION = "0.0.1" + VERSION = "0.0.2" )