Skip to content

Commit

Permalink
Remove upload items from queue if they are for files no longer in the…
Browse files Browse the repository at this point in the history
…ir set (#55)

* Include error message in log output when we abort client requests.
  • Loading branch information
sb10 authored Nov 24, 2023
1 parent f8d46c6 commit f1b92b3
Show file tree
Hide file tree
Showing 7 changed files with 171 additions and 68 deletions.
37 changes: 19 additions & 18 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/gammazero/workerpool v1.1.3
github.com/gin-gonic/gin v1.9.1
github.com/go-ldap/ldap/v3 v3.4.4
github.com/go-resty/resty/v2 v2.7.0
github.com/go-resty/resty/v2 v2.10.0
github.com/hashicorp/go-multierror v1.1.1
github.com/inconshreveable/log15 v3.0.0-testing.5+incompatible
github.com/moby/sys/mountinfo v0.6.2
Expand All @@ -21,7 +21,7 @@ require (
github.com/smartystreets/goconvey v1.7.2
github.com/spf13/cobra v1.7.0
github.com/ugorji/go/codec v1.2.11
github.com/wtsi-hgi/go-authserver v1.1.0
github.com/wtsi-hgi/go-authserver v1.2.1
github.com/wtsi-hgi/grand v1.0.0
github.com/wtsi-npg/extendo/v2 v2.6.1
github.com/wtsi-npg/logshim v1.3.0
Expand All @@ -33,7 +33,7 @@ require (
)

require (
cloud.google.com/go/compute v1.20.0 // indirect
cloud.google.com/go/compute v1.20.1 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
code.cloudfoundry.org/bytefmt v0.0.0-20230406175530-3579ae0680eb // indirect
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
Expand All @@ -43,8 +43,9 @@ require (
github.com/VividCortex/ewma v1.2.0 // indirect
github.com/alexflint/go-filemutex v1.2.0 // indirect
github.com/appleboy/gin-jwt/v2 v2.9.1 // indirect
github.com/bytedance/sonic v1.9.1 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
github.com/bytedance/sonic v1.10.2 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
github.com/chenzhuoyu/iasm v0.9.1 // indirect
github.com/creasty/defaults v1.7.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
Expand All @@ -54,7 +55,7 @@ require (
github.com/docker/go-units v0.5.0 // indirect
github.com/docker/spdystream v0.2.0 // indirect
github.com/fanatic/go-infoblox v0.0.0-20190709161059-e25f3820238c // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/gammazero/deque v0.2.1 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/gin-contrib/secure v0.0.1 // indirect
Expand All @@ -64,7 +65,7 @@ require (
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.14.0 // indirect
github.com/go-playground/validator/v10 v10.16.0 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/gofrs/uuid v4.4.0+incompatible // indirect
Expand All @@ -78,8 +79,8 @@ require (
github.com/gophercloud/gophercloud v1.4.0 // indirect
github.com/gophercloud/utils v0.0.0-20230523080330-de873b9cf00d // indirect
github.com/gopherjs/gopherjs v1.17.2 // indirect
github.com/gorilla/securecookie v1.1.1 // indirect
github.com/gorilla/sessions v1.2.1 // indirect
github.com/gorilla/securecookie v1.1.2 // indirect
github.com/gorilla/sessions v1.2.2 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grafov/bcast v0.0.0-20190217190352-1447f067e08d // indirect
github.com/hanwen/go-fuse/v2 v2.3.0 // indirect
Expand All @@ -94,17 +95,17 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/jtolds/gls v4.20.0+incompatible // indirect
github.com/klauspost/compress v1.16.5 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/leodido/go-urn v1.2.4 // indirect
github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
github.com/lestrrat-go/blackmagic v1.0.1 // indirect
github.com/lestrrat-go/blackmagic v1.0.2 // indirect
github.com/lestrrat-go/httpcc v1.0.1 // indirect
github.com/lestrrat-go/iter v1.0.2 // indirect
github.com/lestrrat-go/jwx v1.2.26 // indirect
github.com/lestrrat-go/option v1.0.1 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/minio/md5-simd v1.1.2 // indirect
github.com/minio/minio-go/v7 v7.0.55 // indirect
Expand All @@ -117,7 +118,7 @@ require (
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/petermattis/goid v0.0.0-20230518223814-80aa455d8761 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pkg/sftp v1.13.5 // indirect
Expand All @@ -135,18 +136,18 @@ require (
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/wtsi-hgi/godirwalk v1.18.1 // indirect
github.com/yusufpapurcu/wmi v1.2.3 // indirect
golang.org/x/arch v0.3.0 // indirect
golang.org/x/arch v0.6.0 // indirect
golang.org/x/crypto v0.15.0 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/oauth2 v0.14.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.9.2 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/tylerb/graceful.v1 v1.2.15 // indirect
Expand Down
Loading

0 comments on commit f1b92b3

Please sign in to comment.