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

cli: Adjust logging format from plugin hooks to CLI's format #1108

Merged
merged 2 commits into from
Apr 23, 2024
Merged

cli: Adjust logging format from plugin hooks to CLI's format #1108

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
be0e512
plugin: Fix json log format
amiremohamadi Apr 10, 2024
6f08970
Turn string into boolean
Acconut Apr 23, 2024
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
3 changes: 2 additions & 1 deletion cmd/tusd/cli/hooks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ func getHookHandler(config *handler.Config) hooks.HookHandler {
stdout.Printf("Using '%s' to load plugin for hooks", Flags.PluginHookPath)

return &plugin.PluginHook{
Path: Flags.PluginHookPath,
Path: Flags.PluginHookPath,
JSONLogFormat: Flags.LogFormat == "json",
}
} else {
return nil
Expand Down
3 changes: 3 additions & 0 deletions pkg/hooks/plugin/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import (

type PluginHook struct {
Path string
// JSONLogFormat specifies whether the logs from the plugin hook should be formatted as JSON.
JSONLogFormat bool

handlerImpl hooks.HookHandler
}
Expand All @@ -37,6 +39,7 @@ func (h *PluginHook) Setup() error {
Name: "plugin",
Level: hclog.Debug,
Output: os.Stdout,
JSONFormat: h.JSONLogFormat,
TimeFormat: "2006/01/02 03:04:05.000000",
}),
})
Expand Down