diff options
| author | Paul Buetow <paul@buetow.org> | 2023-05-22 00:29:41 +0300 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2023-05-22 00:29:41 +0300 |
| commit | 70dd709f8f625c8ecb63e495b5b04a3b3b4066c2 (patch) | |
| tree | 4e5b0c3f927cc504af92dbd099b7e9a7a63cc3ee | |
| parent | 688ac52705c2e4bd015e8f369969de6a91e26d80 (diff) | |
return error from Run
| -rw-r--r-- | cmd/gorum/main.go | 4 | ||||
| -rw-r--r-- | internal/client/client.go | 2 | ||||
| -rw-r--r-- | internal/run.go | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/cmd/gorum/main.go b/cmd/gorum/main.go index e39f620..0348066 100644 --- a/cmd/gorum/main.go +++ b/cmd/gorum/main.go @@ -28,7 +28,9 @@ func main() { ctx, cancel := contextWithSignal() defer cancel() - internal.Start(ctx, *configFile) + if err := internal.Run(ctx, *configFile); err != nil { + panic(err) + } <-ctx.Done() log.Println("Good bye!") diff --git a/internal/client/client.go b/internal/client/client.go index eab3514..6c7fe79 100644 --- a/internal/client/client.go +++ b/internal/client/client.go @@ -11,7 +11,7 @@ import ( func Start(ctx context.Context, conf config.Config) { go func() { for { - log.Println("Client server") + log.Println("Starting client") start(ctx, conf) select { diff --git a/internal/run.go b/internal/run.go index 1473719..b66d40d 100644 --- a/internal/run.go +++ b/internal/run.go @@ -8,12 +8,13 @@ import ( "codeberg.org/snonux/gorum/internal/server" ) -func Start(ctx context.Context, configFile string) { +func Run(ctx context.Context, configFile string) error { conf, err := config.New(configFile) if err != nil { - panic(err) + return err } client.Start(ctx, conf) server.Start(ctx, conf) + return nil } |
