Skip to content

Commit 240d8f8

Browse files
committed
fine-tune a config searching and parsing
1 parent beb122d commit 240d8f8

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

main.go

+15-12
Original file line numberDiff line numberDiff line change
@@ -185,17 +185,14 @@ func loop() {
185185
src, _ := osext.Executable()
186186
srcPath := paths.New(src)
187187
srcDir := srcPath.Parent()
188-
log.Print(srcPath)
189-
log.Print(srcDir)
190188

191189
configPath := srcDir.Join("config.ini")
192-
log.Print(configPath)
193190

194191
if configPath.NotExist() {
195192
// probably we are on macOS, where the config is in a different dir
196193
configPath = srcDir.Parent().Join("Resources", "config.ini")
197194
if configPath.NotExist() {
198-
log.Panic("config.ini file not found")
195+
log.Panicf("config.ini file not found in %s", configPath)
199196
}
200197
}
201198

@@ -208,17 +205,23 @@ func loop() {
208205
if err != nil {
209206
log.Panicf("cannot parse arguments: %s", err)
210207
}
208+
log.Infof("using config from %s", configPath)
211209

212210
// Parse additional ini config if defined
213211
if len(*additionalConfig) > 0 {
214-
log.Print(*additionalConfig)
215-
args, err = parseIni(srcDir.Join(*additionalConfig).String())
216-
if err != nil {
217-
log.Panicf("additional config.ini cannot be parsed: %s", err)
218-
}
219-
err = iniConf.Parse(args)
220-
if err != nil {
221-
log.Panicf("cannot parse arguments: %s", err)
212+
additionalConfigPath := paths.New(*additionalConfig)
213+
if additionalConfigPath.NotExist() {
214+
log.Infof("additional config file not found in %s", additionalConfigPath.String())
215+
} else {
216+
args, err = parseIni(additionalConfigPath.String())
217+
if err != nil {
218+
log.Panicf("additional config cannot be parsed: %s", err)
219+
}
220+
err = iniConf.Parse(args)
221+
if err != nil {
222+
log.Panicf("cannot parse arguments: %s", err)
223+
}
224+
log.Infof("using additional config from %s", additionalConfigPath.String())
222225
}
223226
}
224227

0 commit comments

Comments
 (0)