Browse Source

Fix logs and version output

Douglas Thrift 2 days ago
parent
commit
bfa511f206
2 changed files with 4 additions and 3 deletions
  1. 2 1
      cmd/presence/main.go
  2. 2 2
      config.go

+ 2 - 1
cmd/presence/main.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"runtime"
 	"runtime/debug"
+	"strings"
 
 	"github.com/alecthomas/kong"
 	"goa.design/clue/log"
@@ -34,7 +35,7 @@ func init() {
 	if version == "dev" {
 		info, ok := debug.ReadBuildInfo()
 		if ok {
-			version = info.Main.Version
+			version = strings.TrimPrefix(info.Main.Version, "v")
 		}
 	}
 }

+ 2 - 2
config.go

@@ -142,7 +142,7 @@ func ParseConfigWithContext(ctx context.Context, name string, wNet wrap.Net) (*C
 	} else if !eventName.MatchString(c.IFTTT.Events.Present.Event) {
 		return nil, fmt.Errorf("invalid IFTTT present event name: %#v", c.IFTTT.Events.Present.Event)
 	}
-	log.Print(ctx, log.KV{K: "msg", V: "IFTTT present event"}, log.KV{K: "value", V: c.IFTTT.Events.Present},
+	log.Print(ctx, log.KV{K: "msg", V: "IFTTT present event"}, log.KV{K: "value", V: c.IFTTT.Events.Present.Event},
 		log.KV{K: "value1", V: c.IFTTT.Events.Present.Value1},
 		log.KV{K: "value2", V: c.IFTTT.Events.Present.Value2},
 		log.KV{K: "value3", V: c.IFTTT.Events.Present.Value3})
@@ -152,7 +152,7 @@ func ParseConfigWithContext(ctx context.Context, name string, wNet wrap.Net) (*C
 	} else if !eventName.MatchString(c.IFTTT.Events.Absent.Event) {
 		return nil, fmt.Errorf("invalid IFTTT absent event name: %#v", c.IFTTT.Events.Absent.Event)
 	}
-	log.Print(ctx, log.KV{K: "msg", V: "IFTTT absent event"}, log.KV{K: "value", V: c.IFTTT.Events.Absent},
+	log.Print(ctx, log.KV{K: "msg", V: "IFTTT absent event"}, log.KV{K: "value", V: c.IFTTT.Events.Absent.Event},
 		log.KV{K: "value1", V: c.IFTTT.Events.Absent.Value1},
 		log.KV{K: "value2", V: c.IFTTT.Events.Absent.Value2},
 		log.KV{K: "value3", V: c.IFTTT.Events.Absent.Value3})