this repo has no description
clean up slog usage
+15
-36
+4
-17
cmd/astrolabe/main.go
+4
-17
cmd/astrolabe/main.go
···
2
2
3
3
import (
4
4
"context"
5
-
"fmt"
6
-
slogging "log/slog"
5
+
"log/slog"
7
6
"os"
8
7
9
8
_ "github.com/joho/godotenv/autoload"
···
12
11
"github.com/urfave/cli/v3"
13
12
)
14
13
15
-
var (
16
-
slog = slogging.New(slogging.NewJSONHandler(os.Stdout, nil))
17
-
version = versioninfo.Short()
18
-
)
19
-
20
14
func main() {
21
15
if err := run(os.Args); err != nil {
22
16
slog.Error("fatal", "err", err)
···
27
21
func run(args []string) error {
28
22
29
23
app := cli.Command{
30
-
Name: "astrolabe",
31
-
Usage: "public web interface to explore atproto network content",
24
+
Name: "astrolabe",
25
+
Usage: "public web interface to explore atproto network content",
26
+
Version: versioninfo.Short(),
32
27
}
33
28
34
29
app.Commands = []*cli.Command{
···
51
46
Required: false,
52
47
Sources: cli.EnvVars("DEBUG"),
53
48
},
54
-
},
55
-
},
56
-
&cli.Command{
57
-
Name: "version",
58
-
Usage: "print version",
59
-
Action: func(ctx context.Context, cmd *cli.Command) error {
60
-
fmt.Println(version)
61
-
return nil
62
49
},
63
50
},
64
51
}
+3
-1
cmd/astrolabe/service.go
+3
-1
cmd/astrolabe/service.go
···
6
6
"errors"
7
7
"fmt"
8
8
"io/fs"
9
+
"log/slog"
9
10
"net/http"
10
11
"os"
11
12
"os/signal"
···
54
55
MaxHeaderBytes: httpMaxHeaderBytes,
55
56
}
56
57
58
+
logger := slog.New(slog.NewJSONHandler(os.Stdout, nil))
57
59
e.HideBanner = true
58
-
e.Use(slogecho.New(slog))
60
+
e.Use(slogecho.New(logger))
59
61
e.Use(middleware.Recover())
60
62
e.Use(middleware.BodyLimit("64M"))
61
63
e.HTTPErrorHandler = srv.errorHandler
+1
cmd/athome/handlers.go
+1
cmd/athome/handlers.go
+4
-17
cmd/athome/main.go
+4
-17
cmd/athome/main.go
···
2
2
3
3
import (
4
4
"context"
5
-
"fmt"
6
-
slogging "log/slog"
5
+
"log/slog"
7
6
"os"
8
7
9
8
_ "github.com/joho/godotenv/autoload"
···
12
11
"github.com/urfave/cli/v3"
13
12
)
14
13
15
-
var (
16
-
slog = slogging.New(slogging.NewJSONHandler(os.Stdout, nil))
17
-
version = versioninfo.Short()
18
-
)
19
-
20
14
func main() {
21
15
if err := run(os.Args); err != nil {
22
16
slog.Error("fatal", "err", err)
···
27
21
func run(args []string) error {
28
22
29
23
app := cli.Command{
30
-
Name: "athome",
31
-
Usage: "public web interface to bluesky account content",
24
+
Name: "athome",
25
+
Usage: "public web interface to bluesky account content",
26
+
Version: versioninfo.Short(),
32
27
}
33
28
34
29
app.Commands = []*cli.Command{
···
57
52
Required: false,
58
53
Sources: cli.EnvVars("DEBUG"),
59
54
},
60
-
},
61
-
},
62
-
&cli.Command{
63
-
Name: "version",
64
-
Usage: "print version",
65
-
Action: func(ctx context.Context, cmd *cli.Command) error {
66
-
fmt.Println(version)
67
-
return nil
68
55
},
69
56
},
70
57
}
+3
-1
cmd/athome/service.go
+3
-1
cmd/athome/service.go
···
5
5
"embed"
6
6
"errors"
7
7
"io/fs"
8
+
"log/slog"
8
9
"net/http"
9
10
"os"
10
11
"os/signal"
···
72
73
MaxHeaderBytes: httpMaxHeaderBytes,
73
74
}
74
75
76
+
logger := slog.New(slog.NewJSONHandler(os.Stdout, nil))
75
77
e.HideBanner = true
76
-
e.Use(slogecho.New(slog))
78
+
e.Use(slogecho.New(logger))
77
79
e.Use(middleware.Recover())
78
80
e.Use(echoprometheus.NewMiddleware("athome"))
79
81
e.Use(middleware.BodyLimit("64M"))