mirror of
https://github.com/NotAShelf/watchdog.git
synced 2026-04-15 23:04:10 +00:00
various: reduce file I/O & pre-parse CIDRs
Signed-off-by: NotAShelf <raf@notashelf.dev> Change-Id: I288c299d35fdc833c802e22682f14b8e6a6a6964
This commit is contained in:
parent
ad50debb62
commit
0f38a062e9
2 changed files with 66 additions and 52 deletions
|
|
@ -25,18 +25,23 @@ type versionInfo struct {
|
|||
BuildDate string `json:"buildDate"`
|
||||
}
|
||||
|
||||
func getVersionInfo() versionInfo {
|
||||
data, err := os.ReadFile("version.json")
|
||||
if err != nil {
|
||||
return versionInfo{}
|
||||
}
|
||||
var v versionInfo
|
||||
if err := json.Unmarshal(data, &v); err != nil {
|
||||
return versionInfo{}
|
||||
}
|
||||
return v
|
||||
}
|
||||
|
||||
func getVersion() string {
|
||||
if version != "" {
|
||||
return version
|
||||
}
|
||||
data, err := os.ReadFile("version.json")
|
||||
if err != nil {
|
||||
return "dev"
|
||||
}
|
||||
var v versionInfo
|
||||
if err := json.Unmarshal(data, &v); err != nil {
|
||||
return "dev"
|
||||
}
|
||||
v := getVersionInfo()
|
||||
if v.Version != "" {
|
||||
return v.Version
|
||||
}
|
||||
|
|
@ -47,14 +52,7 @@ func getCommit() string {
|
|||
if commit != "" {
|
||||
return commit
|
||||
}
|
||||
data, err := os.ReadFile("version.json")
|
||||
if err != nil {
|
||||
return "none"
|
||||
}
|
||||
var v versionInfo
|
||||
if err := json.Unmarshal(data, &v); err != nil {
|
||||
return "none"
|
||||
}
|
||||
v := getVersionInfo()
|
||||
if v.Commit != "" {
|
||||
return v.Commit
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue