LumeWeb
/
tusd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cli: Move printing of hook flags to correct file

This commit is contained in:
Marius 2019-09-20 14:33:05 +02:00
parent 59213a5b3a
commit e7dfc9405d
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/tusd/cli/flags.go
View File

@ -34,9 +34,6 @@ var Flags struct {
MetricsPath string MetricsPath string
BehindProxy bool BehindProxy bool
VerboseOutput bool VerboseOutput bool
FileHooksInstalled bool
HttpHooksInstalled bool
} }
func ParseFlags() { func ParseFlags() {
@ -70,15 +67,6 @@ func ParseFlags() {
if Flags.FileHooksDir != "" { if Flags.FileHooksDir != "" {
Flags.FileHooksDir, _ = filepath.Abs(Flags.FileHooksDir) Flags.FileHooksDir, _ = filepath.Abs(Flags.FileHooksDir)
Flags.FileHooksInstalled = true
stdout.Printf("Using '%s' for hooks", Flags.FileHooksDir)
}
if Flags.HttpHooksEndpoint != "" {
Flags.HttpHooksInstalled = true
stdout.Printf("Using '%s' as the endpoint for hooks", Flags.HttpHooksEndpoint)
} }
} }
@ -100,11 +88,4 @@ func SetEnabledHooks() {
if len(Flags.EnabledHooks) == 0 { if len(Flags.EnabledHooks) == 0 {
Flags.EnabledHooks = hooks.AvailableHooks Flags.EnabledHooks = hooks.AvailableHooks
} }
var enabledHooksString []string
for _, h := range Flags.EnabledHooks {
enabledHooksString = append(enabledHooksString, string(h))
}
stdout.Printf("Enabled hook events: %s", strings.Join(enabledHooksString, ", "))
} }

14
cmd/tusd/cli/hooks.go
View File

@ -3,6 +3,7 @@ package cli
import ( import (
"fmt" "fmt"
"strconv" "strconv"
"strings"
"github.com/tus/tusd/cmd/tusd/cli/hooks" "github.com/tus/tusd/cmd/tusd/cli/hooks"
"github.com/tus/tusd/pkg/handler" "github.com/tus/tusd/pkg/handler"
@ -44,16 +45,22 @@ func SetupHookMetrics() {
func SetupPreHooks(config *handler.Config) error { func SetupPreHooks(config *handler.Config) error {
if Flags.FileHooksDir != "" { if Flags.FileHooksDir != "" {
stdout.Printf("Using '%s' for hooks", Flags.FileHooksDir)
hookHandler = &hooks.FileHook{ hookHandler = &hooks.FileHook{
Directory: Flags.FileHooksDir, Directory: Flags.FileHooksDir,
} }
} else if Flags.HttpHooksEndpoint != "" { } else if Flags.HttpHooksEndpoint != "" {
stdout.Printf("Using '%s' as the endpoint for hooks", Flags.HttpHooksEndpoint)
hookHandler = &hooks.HttpHook{ hookHandler = &hooks.HttpHook{
Endpoint: Flags.HttpHooksEndpoint, Endpoint: Flags.HttpHooksEndpoint,
MaxRetries: Flags.HttpHooksRetry, MaxRetries: Flags.HttpHooksRetry,
Backoff: Flags.HttpHooksBackoff, Backoff: Flags.HttpHooksBackoff,
} }
} else if Flags.PluginHookPath != "" { } else if Flags.PluginHookPath != "" {
stdout.Printf("Using '%s' to load plugin for hooks", Flags.PluginHookPath)
hookHandler = &hooks.PluginHook{ hookHandler = &hooks.PluginHook{
Path: Flags.PluginHookPath, Path: Flags.PluginHookPath,
} }
@ -61,6 +68,13 @@ func SetupPreHooks(config *handler.Config) error {
return nil return nil
} }
var enabledHooksString []string
for _, h := range Flags.EnabledHooks {
enabledHooksString = append(enabledHooksString, string(h))
}
stdout.Printf("Enabled hook events: %s", strings.Join(enabledHooksString, ", "))
if err := hookHandler.Setup(); err != nil { if err := hookHandler.Setup(); err != nil {
return err return err
} }