summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--go.mod7
-rw-r--r--go.sum13
-rw-r--r--handlers/cgit/cgit.go8
-rw-r--r--handlers/git/git.go9
-rw-r--r--main.go16
5 files changed, 15 insertions, 38 deletions
diff --git a/go.mod b/go.mod
index e7b8dde..5187c20 100644
--- a/go.mod
+++ b/go.mod
@@ -4,14 +4,7 @@ go 1.18
require (
github.com/gorilla/mux v1.8.0
- github.com/rs/zerolog v1.28.0
golang.org/x/sync v0.1.0
olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3
sigs.k8s.io/controller-runtime v0.13.1
)
-
-require (
- github.com/mattn/go-colorable v0.1.12 // indirect
- github.com/mattn/go-isatty v0.0.14 // indirect
- golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
-)
diff --git a/go.sum b/go.sum
index e49fcee..8762969 100644
--- a/go.sum
+++ b/go.sum
@@ -1,26 +1,13 @@
-github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.28.0 h1:MirSo27VyNi7RJYP3078AA1+Cyzd2GB66qy3aUHvsWY=
-github.com/rs/zerolog v1.28.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
diff --git a/handlers/cgit/cgit.go b/handlers/cgit/cgit.go
index d971012..261e9a2 100644
--- a/handlers/cgit/cgit.go
+++ b/handlers/cgit/cgit.go
@@ -5,12 +5,11 @@ package cgit
import (
"fmt"
- "log"
+ "log/slog"
"net/http"
"net/http/cgi"
"path/filepath"
- "github.com/rs/zerolog"
"go.terinstock.com/cgit-httpd/server"
)
@@ -19,7 +18,7 @@ type Options struct {
ReposRoot string
AssetsDir string
ConfigFile string
- Logger zerolog.Logger
+ Logger *slog.Logger
}
type Builder struct {
@@ -40,8 +39,7 @@ func New(options Options) *Builder {
Env: []string{
fmt.Sprintf("CGIT_CONFIG=%s", options.ConfigFile),
},
- Logger: log.New(options.Logger, "", 0),
- Stderr: options.Logger.Level(zerolog.ErrorLevel),
+ Logger: slog.NewLogLogger(options.Logger.Handler(), slog.LevelInfo),
},
}
}
diff --git a/handlers/git/git.go b/handlers/git/git.go
index 30e8d8f..5af8428 100644
--- a/handlers/git/git.go
+++ b/handlers/git/git.go
@@ -5,18 +5,16 @@ package git
import (
"fmt"
- "log"
+ "log/slog"
"net/http"
"net/http/cgi"
-
- "github.com/rs/zerolog"
)
type Options struct {
CGI string
ReposRoot string
ExportAll bool
- Logger zerolog.Logger
+ Logger *slog.Logger
}
type Builder struct {
@@ -42,8 +40,7 @@ func New(options Options) *Builder {
Path: options.CGI,
Dir: options.ReposRoot,
Env: e,
- Logger: log.New(options.Logger, "", 0),
- Stderr: options.Logger.Level(zerolog.ErrorLevel),
+ Logger: slog.NewLogLogger(options.Logger.Handler(), slog.LevelInfo),
},
}
}
diff --git a/main.go b/main.go
index 6923554..3c123d2 100644
--- a/main.go
+++ b/main.go
@@ -5,6 +5,7 @@ package main
import (
"flag"
+ "log/slog"
"net"
"net/http"
"net/http/pprof"
@@ -13,7 +14,6 @@ import (
"time"
"github.com/gorilla/mux"
- "github.com/rs/zerolog"
"go.terinstock.com/cgit-httpd/handlers/cgit"
"go.terinstock.com/cgit-httpd/handlers/git"
"go.terinstock.com/cgit-httpd/manager"
@@ -27,14 +27,16 @@ func main() {
flag.StringVar(&configFile, "config", "./config.edn", "path to cgit-httpd configuration file")
flag.Parse()
- logger := zerolog.New(os.Stdout).With().Logger()
+ logger := slog.New(slog.NewTextHandler(os.Stderr, nil))
+ slog.SetDefault(logger)
cfg, err := readConfig(configFile)
if err != nil {
- logger.Fatal().Err(err).Send()
+ logger.Error("could not parse config", "error", err)
+ os.Exit(1)
}
- logger.Info().Interface("config", cfg).Send()
+ logger.Info("", "config", cfg)
gitMux := mux.NewRouter()
@@ -43,7 +45,7 @@ func main() {
ReposRoot: cfg.ReposRoot,
AssetsDir: cfg.CGit.AssetsDir,
ConfigFile: cfg.CGit.ConfigFile,
- Logger: logger.With().Str("handler", "cgit").Logger(),
+ Logger: logger.With("handler", "cgit"),
}).
WithRegister(RegistererFunc(gitMux.Handle)).
Build()
@@ -52,7 +54,7 @@ func main() {
CGI: cfg.Git.CGI,
ReposRoot: cfg.ReposRoot,
ExportAll: cfg.Git.ExportAll,
- Logger: logger.With().Str("handler", "git").Logger(),
+ Logger: logger.With("handler", "git"),
}).
WithRegister(RegistererFunc(gitMux.Handle)).
Build()
@@ -88,7 +90,7 @@ func main() {
}
if err := m.Start(signals.SetupSignalHandler()); err != nil {
- logger.Info().Err(err).Msg("manager stopped")
+ logger.Info("manager stopped", "error", err)
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-07-01 11:04:33 +0000