cco/go-scopes
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

forge/rep: use log for error output; logging/log.Error: add 'err' parameter

Browse source
This commit is contained in:
Helmut Merz 2023-08-07 19:50:02 +02:00
parent 591191deb0
commit 9d588ce2ee
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/message/message.go
View file

@ -101,7 +101,7 @@ type payload struct {
func (pl *payload) String() string { func (pl *payload) String() string {
b, err := json.Marshal(pl.data) b, err := json.Marshal(pl.data)
if err != nil { if err != nil {
log.Error().Err(err).Msg("payload.String()") log.Error(err).Msg("payload.String()")
} }
return string(b) return string(b)
} }
@ -113,7 +113,7 @@ func (pl *payload) Data() interface{} {
func (pl *payload) FromJson(s string) lib.Payload { func (pl *payload) FromJson(s string) lib.Payload {
err := json.Unmarshal([]byte(s), &pl.data) err := json.Unmarshal([]byte(s), &pl.data)
if err != nil { if err != nil {
log.Error().Err(err).Msg("payload.FromJson()") log.Error(err).Msg("payload.FromJson()")
} }
return pl return pl
} }

5
forge/rep/json.go
View file

@ -2,14 +2,15 @@ package rep
import ( import (
"encoding/json" "encoding/json"
"fmt"
"git.sr.ht/~cco/go-scopes/logging/log"
) )
func ParseJson(inp string) coderep { func ParseJson(inp string) coderep {
var raw interface{} var raw interface{}
err := json.Unmarshal([]byte(inp), &raw) err := json.Unmarshal([]byte(inp), &raw)
if err != nil { if err != nil {
fmt.Println(err) log.Error(err).Msg("rep.ParseJson")
return nil return nil
} }
rep := prepare(raw) rep := prepare(raw)

5
forge/rep/rep.go
View file

@ -9,6 +9,7 @@ import (
"git.sr.ht/~cco/go-scopes/common/voc" "git.sr.ht/~cco/go-scopes/common/voc"
"git.sr.ht/~cco/go-scopes/forge" "git.sr.ht/~cco/go-scopes/forge"
"git.sr.ht/~cco/go-scopes/logging/log"
) )
// may be: code, module, string, int, float // 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 { if v, err := compStr(f, i); err == nil {
c.Append(v) c.Append(v)
} else { } else {
fmt.Println(err) log.Error(err).Msg("rep.Compile")
} }
case code: case code:
c.Append(i.Compile(f)) 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 { if v, ok := f.Voc().Lookup(s); ok {
return forge.FItem(v), nil 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 { func makeCode(ri []interface{}) code {

5
logging/log/log.go
View file

@ -15,5 +15,8 @@ var (
Debug = logging.GetLogger(nil).Debug Debug = logging.GetLogger(nil).Debug
Info = logging.GetLogger(nil).Info Info = logging.GetLogger(nil).Info
Warn = logging.GetLogger(nil).Warn Warn = logging.GetLogger(nil).Warn
Error = logging.GetLogger(nil).Error
) )
func Error(err error) *logging.Evt {
return logging.GetLogger(nil).Error().Err(err)
}