fix: Fixing synchronisation key computation

Signed-off-by: Vincent Boutour <[email protected]>
ViBiOh · May 24, 2022 · 267fbaa · 267fbaa
1 parent 66d47de
commit 267fbaa
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/pkg/notifier/notifier.go b/pkg/notifier/notifier.go
@@ -163,11 +163,11 @@ func (a App) getKetchupToNotify(ctx context.Context, releases []model.Release) (
 }
 
 func releaseKey(r model.Release) string {
-	return fmt.Sprintf("%d|%s", r.Repository.ID, r.Pattern)
+	return fmt.Sprintf("%10d|%s", r.Repository.ID, r.Pattern)
 }
 
 func ketchupKey(k model.Ketchup) string {
-	return fmt.Sprintf("%d|%s", k.Repository.ID, k.Pattern)
+	return fmt.Sprintf("%10d|%s", k.Repository.ID, k.Pattern)
 }
 
 func (a App) syncReleasesByUser(ctx context.Context, releases []model.Release, ketchups []model.Ketchup) map[model.User][]model.Release {

diff --git a/pkg/notifier/releases.go b/pkg/notifier/releases.go
@@ -15,21 +15,28 @@ func (a App) getNewReleases(ctx context.Context) ([]model.Release, uint64, error
 	var releases, helmReleases []model.Release
 	var releasesCount, helmCount uint64
 
-	wg := concurrent.NewFailFast(2)
-	ctx = wg.WithContext(ctx)
+	wg := concurrent.NewLimited(2)
+
+	wg.Go(func() {
+		var err error
 
-	wg.Go(func() (err error) {
 		releases, releasesCount, err = a.getNewStandardReleases(ctx)
-		return
+		if err != nil {
+			logger.Error("unable to fetch standard releases: %s", err)
+		}
 	})
-	wg.Go(func() (err error) {
+
+	wg.Go(func() {
+		var err error
+
 		helmReleases, helmCount, err = a.getNewHelmReleases(ctx)
-		return
+
+		if err != nil {
+			logger.Error("unable to fetch helm releases: %s", err)
+		}
 	})
 
-	if err := wg.Wait(); err != nil {
-		return nil, 0, err
-	}
+	wg.Wait()
 
 	return append(releases, helmReleases...), releasesCount + helmCount, nil
 }