From 3e33b52642b2b4d5a0c7a8d3a7a6bb269553be1f Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Tue, 3 Sep 2024 10:11:51 +0300 Subject: Partners and Servers are now slices --- internal/server/repository/repository.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'internal/server/repository') diff --git a/internal/server/repository/repository.go b/internal/server/repository/repository.go index 9641ce4..76d8219 100644 --- a/internal/server/repository/repository.go +++ b/internal/server/repository/repository.go @@ -228,12 +228,12 @@ func (r Repository) Merge(otherEnt types.Entry) error { func (r Repository) MergeRemotely(ctx context.Context) error { var errs []error - partners, err := r.conf.Partners() - if err != nil { - return err + if len(r.conf.Partners) == 0 { + log.Println("No partners configured - skipping remote merge operation") + return nil } - for _, partner := range partners { + for _, partner := range r.conf.Partners { if err := r.mergeRemotelyFromPartner(ctx, partner); err != nil { errs = append(errs, err) } -- cgit v1.2.3