Merge pull request #9656 from owncloud/reuse-node-id

reuse node id when registering services
This commit is contained in:
Jörn Friedrich Dreyer
2024-07-30 11:42:05 +02:00
committed by GitHub
148 changed files with 483 additions and 630 deletions
+5 -1
View File
@@ -1,7 +1,10 @@
package command
import (
"context"
"os"
"os/signal"
"syscall"
"github.com/owncloud/ocis/v2/ocis-pkg/clihelper"
"github.com/owncloud/ocis/v2/ocis-pkg/config"
@@ -25,5 +28,6 @@ func Execute() error {
)
}
return app.Run(os.Args)
ctx, _ := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
return app.RunContext(ctx, os.Args)
}
+1 -1
View File
@@ -21,7 +21,7 @@ func Server(cfg *config.Config) *cli.Command {
Action: func(c *cli.Context) error {
// Prefer the in-memory registry as the default when running in single-binary mode
r := runtime.New(cfg)
return r.Start()
return r.Start(c.Context)
},
}
}