aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXe Iaso <me@xeiaso.net>2023-08-02 07:24:35 -0400
committerXe Iaso <me@xeiaso.net>2023-08-02 07:24:35 -0400
commit3473dd3f47a405a610e50949e6c38ed60e0ad0c7 (patch)
treeb66172016c074493eea1373fea8388609ee28a61
parent8b3c21be2f6c51e0e26e283d40439bb67fd1151c (diff)
downloadx-3473dd3f47a405a610e50949e6c38ed60e0ad0c7.tar.xz
x-3473dd3f47a405a610e50949e6c38ed60e0ad0c7.zip
some more slog fun
Signed-off-by: Xe Iaso <me@xeiaso.net>
-rw-r--r--cmd/sanguisuga/main.go2
-rw-r--r--cmd/within.website/main.go2
-rw-r--r--internal/slog/slog.go31
3 files changed, 20 insertions, 15 deletions
diff --git a/cmd/sanguisuga/main.go b/cmd/sanguisuga/main.go
index b20ae85..ceeaefd 100644
--- a/cmd/sanguisuga/main.go
+++ b/cmd/sanguisuga/main.go
@@ -146,7 +146,7 @@ func (s *Sanguisuga) HandleIRCMessage(ev *irc.Event) {
slog.Debug("can't parse ShowMeta", "err", err, "name", ta.Name)
return
}
- id := fmt.Sprintf("S%2dE%2d", ti.Season, ti.Episode)
+ id := fmt.Sprintf("S%02dE%02d", ti.Season, ti.Episode)
slog.Debug("found ShowMeta", "title", ti.Title, "id", id, "quality", ti.Resolution, "group", ti.Group)
stateKey := fmt.Sprintf("%s %s", ti.Title, id)
diff --git a/cmd/within.website/main.go b/cmd/within.website/main.go
index 1b782f6..85029f5 100644
--- a/cmd/within.website/main.go
+++ b/cmd/within.website/main.go
@@ -10,6 +10,7 @@ import (
"go.jetpack.io/tyson"
"golang.org/x/exp/slog"
+ "tailscale.com/tsweb"
"within.website/x/internal"
"within.website/x/web/vanity"
)
@@ -69,6 +70,7 @@ func main() {
repo.RegisterHandlers(lg)
}
+ http.HandleFunc("/debug/varz", tsweb.VarzHandler)
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
w.Header().Add("Content-Type", "text/html")
if r.URL.Path != "/" {
diff --git a/internal/slog/slog.go b/internal/slog/slog.go
index cdb83b9..1c01bab 100644
--- a/internal/slog/slog.go
+++ b/internal/slog/slog.go
@@ -40,23 +40,26 @@ func Init() {
http.HandleFunc("/.within/debug/slog-level", func(w http.ResponseWriter, r *http.Request) {
var level, old slog.Level
- defer r.Body.Close()
-
old = leveler.Level()
- data, err := io.ReadAll(http.MaxBytesReader(w, r.Body, 64))
- if err != nil {
- http.Error(w, err.Error(), http.StatusBadRequest)
- return
- }
+ if r.Method == http.MethodPost {
+ data, err := io.ReadAll(http.MaxBytesReader(w, r.Body, 64))
+ defer r.Body.Close()
+ if err != nil {
+ http.Error(w, err.Error(), http.StatusBadRequest)
+ return
+ }
- if err := (&level).UnmarshalText(data); err != nil {
- http.Error(w, err.Error(), http.StatusBadRequest)
- return
- }
+ if err := (&level).UnmarshalText(data); err != nil {
+ http.Error(w, err.Error(), http.StatusBadRequest)
+ return
+ }
- leveler.Set(level)
- slog.Info("changed level", "from", old, "to", level)
- fmt.Fprintln(w, level)
+ leveler.Set(level)
+ slog.Info("changed level", "from", old, "to", level)
+ fmt.Fprintln(w, level)
+ } else {
+ fmt.Fprintln(w, old)
+ }
})
}