Skip to content

Commit

Permalink
cli: Adjust logging format from plugin hooks to CLI's format (#1108)
Browse files Browse the repository at this point in the history
* plugin: Fix json log format

* Turn string into boolean

---------

Co-authored-by: Marius Kleidl <marius@transloadit.com>
  • Loading branch information
amiremohamadi and Acconut authored Apr 23, 2024
1 parent 26c8870 commit ad0533a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 2 additions & 1 deletion cmd/tusd/cli/hooks.go
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
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

0 comments on commit ad0533a

Please sign in to comment.