From 9cf50ffb4d1d4f45e01b8c9ea85702866d983a2c Mon Sep 17 00:00:00 2001 From: Peixian Wang Date: Fri, 2 Mar 2018 13:23:18 -0500 Subject: [PATCH] Log hooks to stdout --- cmd/tusd/cli/hooks.go | 10 +++++----- cmd/tusd/cli/log.go | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/tusd/cli/hooks.go b/cmd/tusd/cli/hooks.go index 3c64afe..b38f34d 100644 --- a/cmd/tusd/cli/hooks.go +++ b/cmd/tusd/cli/hooks.go @@ -70,16 +70,16 @@ func invokeHook(typ HookType, info tusd.FileInfo) { func invokeHookSync(typ HookType, info tusd.FileInfo, captureOutput bool) ([]byte, error) { switch typ { case HookPostFinish: - logEv("UploadFinished", "id", info.ID, "size", strconv.FormatInt(info.Size, 10)) + logEv(stdout, "UploadFinished", "id", info.ID, "size", strconv.FormatInt(info.Size, 10)) case HookPostTerminate: - logEv("UploadTerminated", "id", info.ID) + logEv(stdout, "UploadTerminated", "id", info.ID) } if !Flags.FileHooksInstalled && !Flags.HttpHooksInstalled { return nil, nil } name := string(typ) - logEv("HookInvocationStart", "type", name, "id", info.ID) + logEv(stdout, "HookInvocationStart", "type", name, "id", info.ID) output := []byte{} err := error(nil) @@ -93,9 +93,9 @@ func invokeHookSync(typ HookType, info tusd.FileInfo, captureOutput bool) ([]byt } if err != nil { - logEv("HookInvocationError", "type", string(typ), "id", info.ID, "error", err.Error()) + logEv(stderr, "HookInvocationError", "type", string(typ), "id", info.ID, "error", err.Error()) } else { - logEv("HookInvocationFinish", "type", string(typ), "id", info.ID) + logEv(stdout, "HookInvocationFinish", "type", string(typ), "id", info.ID) } return output, err diff --git a/cmd/tusd/cli/log.go b/cmd/tusd/cli/log.go index 5cbeb62..1d0a91b 100644 --- a/cmd/tusd/cli/log.go +++ b/cmd/tusd/cli/log.go @@ -10,6 +10,6 @@ import ( var stdout = log.New(os.Stdout, "[tusd] ", 0) var stderr = log.New(os.Stderr, "[tusd] ", 0) -func logEv(eventName string, details ...string) { - tusd.LogEvent(stderr, eventName, details...) +func logEv(logOutput *log.Logger, eventName string, details ...string) { + tusd.LogEvent(logOutput, eventName, details...) }