From fda6d10897dd84459c57ab67ed26a82fc585d654 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Mon, 6 Jan 2025 21:52:07 +0100 Subject: [PATCH] chore: add logger --- cmd/orbis/main.go | 6 ++++-- cmd/orbis/root.go | 15 +++++++++++++-- go.mod | 2 ++ go.sum | 4 ++++ internal/app/app.go | 19 +++++++++++++++++++ internal/app/logging.go | 12 ++++++++++++ 6 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 internal/app/app.go create mode 100644 internal/app/logging.go diff --git a/cmd/orbis/main.go b/cmd/orbis/main.go index 3569349..01b4707 100644 --- a/cmd/orbis/main.go +++ b/cmd/orbis/main.go @@ -4,11 +4,13 @@ import ( "fmt" "os" - "github.com/spf13/cobra" + "git.front.kjuulh.io/kjuulh/orbis/internal/app" ) func main() { - if err := newRoot().Execute(); err != nil { + app := app.NewApp() + + if err := newRoot(app).Execute(); err != nil { fmt.Printf("%s\n", err) os.Exit(1) } diff --git a/cmd/orbis/root.go b/cmd/orbis/root.go index 7229f30..c377111 100644 --- a/cmd/orbis/root.go +++ b/cmd/orbis/root.go @@ -1,11 +1,22 @@ package main -import "github.com/spf13/cobra" +import ( + "git.front.kjuulh.io/kjuulh/orbis/internal/app" + "github.com/spf13/cobra" +) + +func newRoot(app *app.App) *cobra.Command { + logger := app.Logger() -func newRoot() *cobra.Command { cmd := &cobra.Command{ Use: "orbis", Short: "Orbis is a data workflow scheduler for all your batch and real-time needs", + + RunE: func(cmd *cobra.Command, args []string) error { + logger.Info("starting orbis") + + return nil + }, } return cmd diff --git a/go.mod b/go.mod index 62128d1..c288e92 100644 --- a/go.mod +++ b/go.mod @@ -7,4 +7,6 @@ require github.com/spf13/cobra v1.8.1 require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect + gitlab.com/greyxor/slogor v1.6.0 // indirect + golang.org/x/sys v0.28.0 // indirect ) diff --git a/go.sum b/go.sum index 912390a..7bf7282 100644 --- a/go.sum +++ b/go.sum @@ -6,5 +6,9 @@ github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +gitlab.com/greyxor/slogor v1.6.0 h1:K9QsAoa4leFQfO2RF2MkZ8BYkk2HQpYWykmd4G5R5+Y= +gitlab.com/greyxor/slogor v1.6.0/go.mod h1:6UWQsLLkeNL4o911soP9jvCMzXWgokLqzZP+eekAyyU= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/app/app.go b/internal/app/app.go new file mode 100644 index 0000000..e916092 --- /dev/null +++ b/internal/app/app.go @@ -0,0 +1,19 @@ +package app + +import ( + "log/slog" +) + +type App struct { + logger *slog.Logger +} + +func NewApp() *App { + return &App{ + logger: setupLogging(), + } +} + +func (a *App) Logger() *slog.Logger { + return a.logger +} diff --git a/internal/app/logging.go b/internal/app/logging.go new file mode 100644 index 0000000..75576ac --- /dev/null +++ b/internal/app/logging.go @@ -0,0 +1,12 @@ +package app + +import ( + "log/slog" + "os" + + "gitlab.com/greyxor/slogor" +) + +func setupLogging() *slog.Logger { + return slog.New(slogor.NewHandler(os.Stderr)) +}