diff options
| author | Paul Buetow <paul@buetow.org> | 2024-09-03 10:11:51 +0300 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2024-09-03 10:11:51 +0300 |
| commit | 3e33b52642b2b4d5a0c7a8d3a7a6bb269553be1f (patch) | |
| tree | 1fc4ef6c6cc98ec024b00d8874eec8e43485bef4 /internal/server | |
| parent | c907dd82c9ba2e7b1924b9f4febba68f9b04a38d (diff) | |
Partners and Servers are now slices
Diffstat (limited to 'internal/server')
| -rw-r--r-- | internal/server/repository/repository.go | 8 |
1 files changed, 4 insertions, 4 deletions
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) } |
