summaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2024-08-12 10:20:10 +0300
committerPaul Buetow <paul@buetow.org>2024-08-12 10:20:10 +0300
commit29705a8e5aad0c5edd4ed720e5c4b5d58a91c6e6 (patch)
treed3901000e0075b6906a40e8e43e0b8df35e7a979 /internal
parent22df44d2e4a6ab928d916da9c1e26aa5d32bbb2d (diff)
more idiomatic go
Diffstat (limited to 'internal')
-rw-r--r--internal/config/server/server.go7
-rw-r--r--internal/server/repository/repository.go6
2 files changed, 7 insertions, 6 deletions
diff --git a/internal/config/server/server.go b/internal/config/server/server.go
index 109099e..7ecfac4 100644
--- a/internal/config/server/server.go
+++ b/internal/config/server/server.go
@@ -42,9 +42,10 @@ func New(configFile string) (ServerConfig, error) {
return conf, nil
}
-func (conf ServerConfig) Partners() []string {
+func (conf ServerConfig) Partners() ([]string, error) {
if partners := strings.Split(conf.Partner, ","); partners[0] != "" {
- return partners
+ return partners, nil
}
- return []string{}
+
+ return []string{}, fmt.Errorf("no partners configured")
}
diff --git a/internal/server/repository/repository.go b/internal/server/repository/repository.go
index b6a1edb..ffe4d37 100644
--- a/internal/server/repository/repository.go
+++ b/internal/server/repository/repository.go
@@ -187,9 +187,9 @@ func (r Repository) Merge(otherEnt types.Entry) error {
func (r Repository) MergeRemotely(ctx context.Context) error {
var errs []error
- partners := r.conf.Partners()
- if len(partners) == 0 {
- return fmt.Errorf("no parter for remote merge operation configured")
+ partners, err := r.conf.Partners()
+ if err != nil {
+ return err
}
for _, partner := range partners {