Skip to content

Store filepaths in generated configuration file using forward slashes #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
samkumar wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Store filepaths in generated configuration file using forward slashes #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions internal/core/configparser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package core

import (
"os"
"path/filepath"

log "github.com/cihub/seelog"
"github.com/scalingdata/gcfg"
Expand All @@ -43,18 +44,16 @@ type BWConfig struct {
// it will default to "bw2.ini" in the current directory
func LoadConfig(filename string) *BWConfig {
rv := &BWConfig{}
if filename != "" {
err := gcfg.ReadFileInto(rv, filename)
if err != nil {
log.Criticalf("Could not load specified config file: %v", err)
os.Exit(1)
}
} else {
err := gcfg.ReadFileInto(rv, "bw2.ini")
if err != nil {
log.Criticalf("Could not load default config file: %v", err)
os.Exit(1)
}
if filename == "" {
filename = "bw2.ini"
}
err := gcfg.ReadFileInto(rv, filename)
if err != nil {
log.Criticalf("Could not load specified config file: %v", err)
os.Exit(1)
}
rv.Router.Entity = filepath.FromSlash(rv.Router.Entity)
rv.Router.DB = filepath.FromSlash(rv.Router.DB)
rv.Router.LogPath = filepath.FromSlash(rv.Router.LogPath)
return rv
}
6 changes: 3 additions & 3 deletions makeconf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ func makeConf(c *cli.Context) error {
file := []string{
("# generated for " + util.BW2Version + "\n"),
("[router]\n"),
("Entity=" + entfile + "\n"),
("DB=" + dbpath + "\n"),
("LogPath=" + lpath + "\n"),
("Entity=" + filepath.ToSlash(entfile) + "\n"),
("DB=" + filepath.ToSlash(dbpath) + "\n"),
("LogPath=" + filepath.ToSlash(lpath) + "\n"),
("[native]\n"),
("ListenOn=:4514\n"),
("[oob]\n"),
Expand Down