From ad5c45ff16b5c999652acd8b606b2888da3ae08d Mon Sep 17 00:00:00 2001 From: Kevin van Zonneveld Date: Wed, 14 Mar 2018 12:27:48 +0100 Subject: [PATCH 1/4] Remove frey references --- .gitignore | 4 ---- .travis.yml | 1 - tusd.code-workspace | 8 ++++++++ 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 tusd.code-workspace diff --git a/.gitignore b/.gitignore index 967dfb9..12ba298 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,5 @@ tusd/data cover.out data/ -.infra/env.* -.infra/ssh/tusd.pem -.infra/Frey-residu* -.infra/ssh/frey-tusd.pem node_modules/ .DS_Store diff --git a/.travis.yml b/.travis.yml index 8c5061b..3adf728 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ cache: apt: true directories: - $HOME/.gimme - - $HOME/.frey - "$HOME/google-cloud-sdk/" env: global: diff --git a/tusd.code-workspace b/tusd.code-workspace new file mode 100644 index 0000000..5709732 --- /dev/null +++ b/tusd.code-workspace @@ -0,0 +1,8 @@ +{ + "folders": [ + { + "path": "." + } + ], + "settings": {} +} From 9cf50ffb4d1d4f45e01b8c9ea85702866d983a2c Mon Sep 17 00:00:00 2001 From: Peixian Wang Date: Fri, 2 Mar 2018 13:23:18 -0500 Subject: [PATCH 2/4] 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...) } From 12d4d299920b9347719e68b73e0d03bf4517a886 Mon Sep 17 00:00:00 2001 From: Marius Date: Sat, 17 Mar 2018 11:18:58 +0100 Subject: [PATCH 3/4] Raise size limit to 20GB for @ifedapoolarewaju's tests --- .infra/kube/tusd-kube.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.infra/kube/tusd-kube.yaml b/.infra/kube/tusd-kube.yaml index 9b83ccc..b5866eb 100644 --- a/.infra/kube/tusd-kube.yaml +++ b/.infra/kube/tusd-kube.yaml @@ -32,7 +32,7 @@ spec: containers: - image: docker.io/tusproject/tusd:latest imagePullPolicy: Always - args: ["-port=8080","-behind-proxy","-max-size=1000000000"] + args: ["-port=8080","-behind-proxy","-max-size=20000000000"] name: tusd resources: limits: From 364825871e65ec8d9349659c4b72f08d5ee9485a Mon Sep 17 00:00:00 2001 From: Marius Date: Sat, 17 Mar 2018 11:40:17 +0100 Subject: [PATCH 4/4] Update Helm installation script version We were unable to install Helm on Travis CI as described in https://github.com/kubernetes/helm/issues/3665. A recent commit in master fixed this issue. @kiloreux --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3adf728..11a5909 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ before_deploy: - gcloud --quiet version - gcloud --quiet components update - gcloud --quiet components update kubectl -- curl https://raw.githubusercontent.com/kubernetes/helm/8478fb4fc723885b155c924d1c8c410b7a9444e6/scripts/get | bash +- curl https://raw.githubusercontent.com/kubernetes/helm/9476fcc10aaaf4bbcbeb6b7b9e62e9f03d312697/scripts/get | bash deploy: - provider: releases api_key: