diff --git a/core/message/message.go b/core/message/message.go index 71ffae1..537a7b1 100644 --- a/core/message/message.go +++ b/core/message/message.go @@ -101,7 +101,7 @@ type payload struct { func (pl *payload) String() string { b, err := json.Marshal(pl.data) if err != nil { - log.Error().Err(err).Msg("payload.String()") + log.Error(err).Msg("payload.String()") } return string(b) } @@ -113,7 +113,7 @@ func (pl *payload) Data() interface{} { func (pl *payload) FromJson(s string) lib.Payload { err := json.Unmarshal([]byte(s), &pl.data) if err != nil { - log.Error().Err(err).Msg("payload.FromJson()") + log.Error(err).Msg("payload.FromJson()") } return pl } diff --git a/forge/rep/json.go b/forge/rep/json.go index f95c390..803c077 100644 --- a/forge/rep/json.go +++ b/forge/rep/json.go @@ -2,14 +2,15 @@ package rep import ( "encoding/json" - "fmt" + + "git.sr.ht/~cco/go-scopes/logging/log" ) func ParseJson(inp string) coderep { var raw interface{} err := json.Unmarshal([]byte(inp), &raw) if err != nil { - fmt.Println(err) + log.Error(err).Msg("rep.ParseJson") return nil } rep := prepare(raw) diff --git a/forge/rep/rep.go b/forge/rep/rep.go index 871b007..4f82d93 100644 --- a/forge/rep/rep.go +++ b/forge/rep/rep.go @@ -9,6 +9,7 @@ import ( "git.sr.ht/~cco/go-scopes/common/voc" "git.sr.ht/~cco/go-scopes/forge" + "git.sr.ht/~cco/go-scopes/logging/log" ) // may be: code, module, string, int, float @@ -38,7 +39,7 @@ func (ci code) Compile(f forge.FE) forge.FPtr { if v, err := compStr(f, i); err == nil { c.Append(v) } else { - fmt.Println(err) + log.Error(err).Msg("rep.Compile") } case code: c.Append(i.Compile(f)) @@ -60,7 +61,7 @@ func compStr(f forge.FE, s string) (forge.FItem, error) { if v, ok := f.Voc().Lookup(s); ok { return forge.FItem(v), nil } - return nil, fmt.Errorf("not found: %s", s) + return nil, fmt.Errorf("not found: '%s'", s) } func makeCode(ri []interface{}) code { diff --git a/logging/log/log.go b/logging/log/log.go index 9fe203d..4443572 100644 --- a/logging/log/log.go +++ b/logging/log/log.go @@ -15,5 +15,8 @@ var ( Debug = logging.GetLogger(nil).Debug Info = logging.GetLogger(nil).Info Warn = logging.GetLogger(nil).Warn - Error = logging.GetLogger(nil).Error ) + +func Error(err error) *logging.Evt { + return logging.GetLogger(nil).Error().Err(err) +}