Browse Source

don't use logger

master
Georg Hopp 7 years ago
parent
commit
88d159c6ee
Signed by: ghopp GPG Key ID: 4C5D226768784538
  1. 14
      tools.go

14
tools.go

@ -26,14 +26,12 @@ package version
import ( import (
"encoding/json" "encoding/json"
"gitlab.weird-web-workers.org/golang/logger"
) )
type Version struct { type Version struct {
Package string `json:"Package"`
Version string `json:"Version"`
Revision string `json:"Revision"`
Package string `json:"Package"`
Version string `json:"Version"`
Revision string `json:"Revision"`
BuildTime string `json:"BuildTime"` BuildTime string `json:"BuildTime"`
} }
@ -47,14 +45,12 @@ func (v Version) Register() {
versions[v.Package] = v versions[v.Package] = v
} }
func (vMap versionMap) Json() []byte {
func (vMap versionMap) Json() ([]byte, error) {
vSlice := make([]Version, len(vMap)) vSlice := make([]Version, len(vMap))
for _, v := range vMap { for _, v := range vMap {
vSlice = append(vSlice, v) vSlice = append(vSlice, v)
} }
vJson, err := json.Marshal(vSlice)
logger.Default.FailOnError(err, "Unable to marshal versions")
return vJson
return json.Marshal(vSlice)
} }
// vim: ts=4 sts=4 sw=4 noet tw=72: // vim: ts=4 sts=4 sw=4 noet tw=72:
Loading…
Cancel
Save