flexabyte/go-kit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Refactoring

Browse Source 
- logging interface
- log levels
- application interface

Signed-off-by: Jan Tytgat <jan.tytgat@corelayer.eu>
This commit is contained in:
Jan Tytgat
2025-04-29 14:46:04 +02:00
parent b9a06f5fd4
commit 4cea479d42
6 changed files with 85 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
application/config.go
View File

@ -3,6 +3,7 @@ package application
import (
"errors"
"fmt"
"log/slog"
"os"
"time"
@ -15,8 +16,9 @@ type Config struct {
Name string
Title string
Banner string
Version string
Version Version
EnableGracefulShutdown bool
Logger *slog.Logger
OverrideRunE func(cmd *cobra.Command, args []string) error
PersistentPreRunE []func(cmd *cobra.Command, args []string) error // collection of PreRunE functions
PersistentPostRunE []func(cmd *cobra.Command, args []string) error // collection of PostRunE functions
@ -59,12 +61,7 @@ func (c Config) getRootCommand() (*cobra.Command, error) {
cmd.AddCommand(subcommand.Initialize(c.SubCommandInitializeFunc))
}
var v semver.Version
if v, err = c.ParseVersion(); err != nil {
return nil, err
}
configureVersionFlag(cmd, v) // Configure app for version information
configureVersionFlag(cmd, c.Version) // Configure app for version information
configureOutputFlags(cmd) // Configure verbosity
configureLoggingFlags(cmd) // Configure logging
cmd.PersistentFlags().SetNormalizeFunc(normalizeFunc) // normalize persistent flags
@ -73,7 +70,7 @@ func (c Config) getRootCommand() (*cobra.Command, error) {
}
func (c Config) ParseVersion() (semver.Version, error) {
return semver.Parse(c.Version)
return semver.Parse(c.Version.Full)
}
func (c Config) RegisterCommand(cmd Commander, f func(*cobra.Command)) {
@ -103,7 +100,7 @@ func (c Config) Validate() error {
}
var err error
if _, err = semver.Parse(c.Version); err != nil {
if _, err = semver.Parse(c.Version.Full); err != nil {
return fmt.Errorf("invalid version: %s", c.Version)
}
return nil