Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Customize loglevel with --verbosity flag #375

Merged
merged 2 commits into from
Jan 15, 2025
Merged

Customize loglevel with --verbosity flag #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c4807d
Customize loglevel with --verbosity flag
n0vad3v Jan 15, 2025
506338c
bump version
n0vad3v Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const (
var (
ConfigPath string
Jobs int
Verbosity int
DumpSystemd bool
DumpConfig bool
ShowVersion bool
Expand All @@ -53,7 +54,7 @@ var (
PrefetchForeground bool // Standalone prefetch, prefetch and exit
AllowNonImage bool
Config = NewWebPConfig()
Version = "0.13.0"
Version = "0.13.1"
WriteLock = cache.New(5*time.Minute, 10*time.Minute)
ConvertLock = cache.New(5*time.Minute, 10*time.Minute)
LocalHostAlias = "local"
Expand Down Expand Up @@ -144,6 +145,12 @@ func init() {
flag.BoolVar(&Prefetch, "prefetch", false, "Prefetch and convert images to optimized format, with WebP Server Go launch normally")
flag.BoolVar(&PrefetchForeground, "prefetch-foreground", false, "Prefetch and convert image to optimized format in foreground, prefetch and exit")
flag.IntVar(&Jobs, "jobs", runtime.NumCPU(), "Prefetch thread, default is all.")
// 0 = silent (no log messages)
// 1 = error (error messages only)
// 2 = warn (error messages and warnings only)
// 3 = info (error messages, warnings and normal activity logs)
// 4 = debug (all info plus additional messages for debugging)
flag.IntVar(&Verbosity, "verbosity", 3, "Log level(0: silent, 1: error, 2: warn, 3:info, 4: debug), default to 3: info")
flag.BoolVar(&DumpConfig, "dump-config", false, "Print sample config.json.")
flag.BoolVar(&ShowVersion, "V", false, "Show version information.")
}
Expand Down
29 changes: 23 additions & 6 deletions webp-server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,7 @@ func setupLogger() {
},
}
log.SetFormatter(formatter)
log.SetLevel(log.InfoLevel)

// fiber logger format
app.Use(logger.New(logger.Config{
Format: config.FiberLogFormat,
TimeFormat: config.TimeDateFormat,
}))
app.Use(recover.New(recover.Config{}))
fmt.Println("Allowed file types as source:", config.Config.AllowedTypes)
fmt.Println("Convert to WebP Enabled:", config.Config.EnableWebP)
Expand All @@ -66,6 +60,29 @@ func init() {
Developed by WebP Server team. /~https://github.com/webp-sh`, config.Version)
// main init is the last one to be called
flag.Parse()
loglevel := config.Verbosity

// Only enable fiber logger if loglevel is greater than 0
if loglevel > 0 {
// fiber logger format
app.Use(logger.New(logger.Config{
Format: config.FiberLogFormat,
TimeFormat: config.TimeDateFormat,
}))
}

switch loglevel {
case 0:
log.SetLevel(log.PanicLevel)
case 1:
log.SetLevel(log.ErrorLevel)
case 2:
log.SetLevel(log.WarnLevel)
case 3:
log.SetLevel(log.InfoLevel)
case 4:
log.SetLevel(log.DebugLevel)
}
// process cli params
if config.DumpConfig {
fmt.Println(config.SampleConfig)
Expand Down
Loading