Compare commits

...

2 Commits

Author SHA1 Message Date
yusing
2b9c0f09ee fix version checking 2025-04-26 06:50:43 +08:00
yusing
efe3eb4ce7 fix: autocert panic 2025-04-26 06:41:15 +08:00
4 changed files with 10 additions and 10 deletions

View File

@@ -82,10 +82,6 @@ func (cfg *Config) Validate() gperr.Error {
}
func (cfg *Config) GetLegoConfig() (*User, *lego.Config, gperr.Error) {
if cfg == nil {
cfg = new(Config)
}
if err := cfg.Validate(); err != nil {
return nil, nil, err
}

View File

@@ -76,7 +76,7 @@ func (p *Provider) ObtainCert() error {
return nil
}
if p.cfg.Provider == ProviderLocal {
if p.cfg.Provider == ProviderPseudo {
t := time.NewTicker(1000 * time.Millisecond)
defer t.Stop()
logging.Info().Msg("init client for pseudo provider")

View File

@@ -265,6 +265,10 @@ func (cfg *Config) initAutoCert(autocertCfg *autocert.Config) gperr.Error {
return nil
}
if autocertCfg == nil {
autocertCfg = new(autocert.Config)
}
user, legoCfg, err := autocertCfg.GetLegoConfig()
if err != nil {
return err

View File

@@ -60,7 +60,7 @@ func Ver(major, minor, patch int) Version {
}
func (v Version) String() string {
return fmt.Sprintf("%d.%d.%d", v.Generation, v.Major, v.Minor)
return fmt.Sprintf("v%d.%d.%d", v.Generation, v.Major, v.Minor)
}
func (v Version) MarshalText() ([]byte, error) {
@@ -101,17 +101,17 @@ func ParseVersion(v string) (ver Version) {
if len(parts) != 3 {
return
}
major, err := strconv.Atoi(parts[0])
gen, err := strconv.Atoi(parts[0])
if err != nil {
return
}
minor, err := strconv.Atoi(parts[1])
major, err := strconv.Atoi(parts[1])
if err != nil {
return
}
patch, err := strconv.Atoi(parts[2])
minor, err := strconv.Atoi(parts[2])
if err != nil {
return
}
return Ver(major, minor, patch)
return Ver(gen, major, minor)
}