Merge branch 'develop'

[nncp.git] / src / log.go

diff --git a/src/log.go b/src/log.go
index 5c98bd7e14916427c236553fea506f39f9668d61..7bb59a3b97cf798e5c35c01d0c76c19154445ba6 100644 (file)
--- a/src/log.go
+++ b/src/log.go
@@ -43,6 +43,8 @@ func (les LEs) Rec() string {
                switch v := le.V.(type) {
                case int, int8, uint8, int64, uint64:
                        val = fmt.Sprintf("%d", v)
+               case bool:
+                       val = fmt.Sprintf("%v", v)
                default:
                        val = fmt.Sprintf("%s", v)
                }
@@ -92,22 +94,18 @@ func (ctx *Ctx) Log(rec string) {
        fd.Close()          // #nosec G104
 }
 
-func (ctx *Ctx) LogD(who string, les LEs, msg string) {
+func (ctx *Ctx) LogD(who string, les LEs, msg func(LEs) string) {
        if !ctx.Debug {
                return
        }
        les = append(LEs{{"Debug", true}, {"Who", who}}, les...)
-       if msg != "" {
-               les = append(les, LE{"Msg", msg})
-       }
+       les = append(les, LE{"Msg", msg(les)})
        fmt.Fprint(os.Stderr, les.Rec())
 }
 
-func (ctx *Ctx) LogI(who string, les LEs, msg string) {
+func (ctx *Ctx) LogI(who string, les LEs, msg func(LEs) string) {
        les = append(LEs{{"Who", who}}, les...)
-       if msg != "" {
-               les = append(les, LE{"Msg", msg})
-       }
+       les = append(les, LE{"Msg", msg(les)})
        rec := les.Rec()
        if !ctx.Quiet {
                fmt.Fprintln(os.Stderr, ctx.HumanizeRec(rec))
@@ -115,11 +113,9 @@ func (ctx *Ctx) LogI(who string, les LEs, msg string) {
        ctx.Log(rec)
 }
 
-func (ctx *Ctx) LogE(who string, les LEs, err error, msg string) {
+func (ctx *Ctx) LogE(who string, les LEs, err error, msg func(LEs) string) {
        les = append(LEs{{"Err", err.Error()}, {"Who", who}}, les...)
-       if msg != "" {
-               les = append(les, LE{"Msg", msg})
-       }
+       les = append(les, LE{"Msg", msg(les)})
        rec := les.Rec()
        if !ctx.Quiet {
                fmt.Fprintln(os.Stderr, ctx.HumanizeRec(rec))