suyono/wingmate
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects 1 Releases 2 Wiki Activity

switch workstation

Browse Source
This commit is contained in:
Suyono
2024-09-19 15:58:58 +10:00
parent a0dad29950
commit dc6d575fae
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/config.go
View File

@@ -15,7 +15,7 @@ import (
const (
EnvPrefix = "WINGMATE"
ConfigPath = "config_path"
PathConfig = "config_path"
DefaultConfigPath = "/etc/wingmate"
ServiceDirName = "service"
CrontabFileName = "crontab"
@@ -30,7 +30,7 @@ const (
VersionFlag = "version"
WMPidProxyPathFlag = "pid-proxy"
WMExecPathFlag = "exec"
ConfigPathFlag = "config"
PathConfigFlag = "config"
VersionCheckKey = "check-version"
)
@@ -83,10 +83,10 @@ func SetVersion(version string) {
func Read() (*Config, error) {
viper.SetEnvPrefix(EnvPrefix)
_ = viper.BindEnv(ConfigPath)
_ = viper.BindEnv(PathConfig)
_ = viper.BindEnv(PidProxyPathConfig)
_ = viper.BindEnv(ExecPathConfig)
viper.SetDefault(ConfigPath, DefaultConfigPath)
viper.SetDefault(PathConfig, DefaultConfigPath)
viper.SetDefault(PidProxyPathConfig, PidProxyPathDefault)
viper.SetDefault(ExecPathConfig, ExecPathDefault)
@@ -109,7 +109,7 @@ func Read() (*Config, error) {
viperMtx: &sync.Mutex{},
ServiceV0: make([]string, 0),
}
configPath := viper.GetString(ConfigPath)
configPath := viper.GetString(PathConfig)
svcdir = filepath.Join(configPath, ServiceDirName)
dirent, err = os.ReadDir(svcdir)
if err != nil {

2
config/config_test.go
View File

@@ -23,7 +23,7 @@ func setup(t *testing.T) {
if configDir, err = os.MkdirTemp("", "wingmate-*-test"); err != nil {
t.Fatal("setup", err)
}
viper.Set(ConfigPath, configDir)
viper.Set(PathConfig, configDir)
}
func tear(t *testing.T) {

4
config/flags.go
View File

@@ -12,12 +12,12 @@ func ParseFlags() {
pflag.CountP(VersionFlag, "v", "check version")
pflag.String(WMPidProxyPathFlag, "", "wmpidproxy path")
pflag.String(WMExecPathFlag, "", "wmexec path")
pflag.StringP(ConfigPathFlag, "c", "", "config path")
pflag.StringP(PathConfigFlag, "c", "", "config path")
pflag.Parse()
_ = viper.BindPFlag(VersionCheckKey, pflag.CommandLine.Lookup(VersionFlag))
_ = viper.BindPFlag(ConfigPath, pflag.CommandLine.Lookup(ConfigPathFlag))
_ = viper.BindPFlag(PathConfig, pflag.CommandLine.Lookup(PathConfigFlag))
_ = viper.BindPFlag(PidProxyPathConfig, pflag.CommandLine.Lookup(WMPidProxyPathFlag))
_ = viper.BindPFlag(ExecPathConfig, pflag.CommandLine.Lookup(WMExecPathFlag))