Skip to content

Commit f867258

Browse files
committed
encode Event to log as JSON
1 parent 17c2cc5 commit f867258

File tree

1 file changed

+21
-4
lines changed

1 file changed

+21
-4
lines changed

cmd/fs_event_log/main.go

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package main
33
import (
44
"bufio"
55
"context"
6+
"encoding/json"
67
"errors"
78
"flag"
89
"fmt"
@@ -46,16 +47,21 @@ func run() error {
4647

4748
events := make(chan esl.Event, 1)
4849
go func() {
50+
enc := json.NewEncoder(os.Stdout)
4951
for ev := range events {
50-
_ = ev
52+
if err := enc.Encode(ev); err != nil {
53+
slog.Error("failed to encode event", slog.String("err", err.Error()))
54+
break
55+
}
5156
}
57+
5258
done()
5359
}()
5460

5561
client, err := esl.Connect(cfg.addr, cfg.password,
56-
esl.WithDumpIn(os.Stdout),
57-
esl.WithLog(slog.Default()),
5862
esl.WithEvents(events),
63+
esl.WithLog(slog.Default()),
64+
// esl.WithDumpIn(os.Stdout),
5965
)
6066
if err != nil {
6167
return err
@@ -89,11 +95,22 @@ func initEnv(filename string) error {
8995

9096
s := bufio.NewScanner(f)
9197
for s.Scan() {
98+
// split to key and value
9299
kv := strings.SplitN(s.Text(), "=", 2)
93100
if len(kv) != 2 {
94101
continue
95102
}
96-
if err := os.Setenv(kv[0], kv[1]); err != nil {
103+
104+
// skip comments
105+
if strings.HasPrefix(kv[1], "#") {
106+
continue
107+
}
108+
109+
// skip end of line comments
110+
v, _, _ := strings.Cut(kv[1], "#")
111+
112+
// set environment
113+
if err := os.Setenv(kv[0], strings.TrimSpace(v)); err != nil {
97114
return fmt.Errorf("failed to set env: %w", err)
98115
}
99116
}

0 commit comments

Comments
 (0)