From 9107284642cec1da819da6ef4b413b5f3fce3ea1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jun 2022 01:35:10 +0000 Subject: [PATCH 1/3] Bump github.com/aws/aws-sdk-go from 1.44.33 to 1.44.34 Bumps [github.com/aws/aws-sdk-go](https://github.com/aws/aws-sdk-go) from 1.44.33 to 1.44.34. - [Release notes](https://github.com/aws/aws-sdk-go/releases) - [Changelog](https://github.com/aws/aws-sdk-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-go/compare/v1.44.33...v1.44.34) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f1f496d..547127f 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/mxpv/podsync require ( github.com/BrianHicks/finch v0.0.0-20140409222414-419bd73c29ec - github.com/aws/aws-sdk-go v1.44.33 + github.com/aws/aws-sdk-go v1.44.34 github.com/dgraph-io/badger v1.6.2 github.com/eduncan911/podcast v1.4.2 github.com/gilliek/go-opml v1.0.0 diff --git a/go.sum b/go.sum index 1b12aca..91eb0d0 100644 --- a/go.sum +++ b/go.sum @@ -7,8 +7,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/aws/aws-sdk-go v1.44.33 h1:OoLO99CdssiyOISnZknsQfIqESOyuMgy7pLrPW7RLKg= -github.com/aws/aws-sdk-go v1.44.33/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.44.34 h1:+ZtWIbtSGLNB99P8eBrxXfJZgiIouzUbpkf/MNxq2yQ= +github.com/aws/aws-sdk-go v1.44.34/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= From 81f989458748f46c77a5ef254274515d4194dff7 Mon Sep 17 00:00:00 2001 From: Contextualist Date: Tue, 14 Jun 2022 21:48:42 -0400 Subject: [PATCH 2/3] Fix struct tag for config `storage.local.data_dir` --- pkg/fs/local.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/fs/local.go b/pkg/fs/local.go index 687ba54..8fef710 100644 --- a/pkg/fs/local.go +++ b/pkg/fs/local.go @@ -13,7 +13,7 @@ import ( // LocalConfig is the storage configuration for local file system type LocalConfig struct { - DataDir string `yaml:"data_dir"` + DataDir string `toml:"data_dir"` } // Local implements local file storage From 59ea55d337ea3061ef9d18120395214ed81511d4 Mon Sep 17 00:00:00 2001 From: Contextualist Date: Tue, 14 Jun 2022 21:52:13 -0400 Subject: [PATCH 3/3] Fix closing feed updates channel too early --- cmd/podsync/main.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/podsync/main.go b/cmd/podsync/main.go index 333d5a6..acb2e76 100644 --- a/cmd/podsync/main.go +++ b/cmd/podsync/main.go @@ -155,6 +155,10 @@ func main() { return } + // Queue of feeds to update + updates := make(chan *feed.Config, 16) + defer close(updates) + group, ctx := errgroup.WithContext(ctx) defer func() { if err := group.Wait(); err != nil && (err != context.Canceled && err != http.ErrServerClosed) { @@ -163,10 +167,6 @@ func main() { log.Info("gracefully stopped") }() - // Queue of feeds to update - updates := make(chan *feed.Config, 16) - defer close(updates) - // Create Cron c := cron.New(cron.WithChain(cron.SkipIfStillRunning(cron.DiscardLogger))) m := make(map[string]cron.EntryID)