arcad/emissary
16
0
Fork 0
Code Issues 14 Pull Requests Packages Projects Releases 3 Wiki Activity

feat(edge): update lib

Browse Source
This commit is contained in:
wpetit
2023-10-19 20:12:46 +02:00
parent e756a60373
commit 4da723e908
4 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/agent/controller/app/controller.go
View File

@ -209,11 +209,13 @@ func (c *Controller) updateApp(ctx context.Context, specs *spec.Spec, appKey str
return nil
}
ctx = logger.With(ctx,
logger.F("appKey", appKey),
logger.F("address", appEntry.Address),
)
if defChanged && server.AppDefHash != 0 {
logger.Info(
ctx, "restarting app",
logger.F("address", appEntry.Address),
)
logger.Info(ctx, "restarting app")
if err := server.Server.Stop(); err != nil {
return errors.WithStack(err)
@ -226,10 +228,7 @@ func (c *Controller) updateApp(ctx context.Context, specs *spec.Spec, appKey str
c.servers[appKey] = serverEntry
} else {
logger.Info(
ctx, "starting app",
logger.F("address", appEntry.Address),
)
logger.Info(ctx, "starting app")
}
if err := server.Server.Start(ctx, appEntry.Address); err != nil {

2
internal/agent/controller/app/server.go
View File

@ -49,7 +49,7 @@ func (s *Server) Start(ctx context.Context, addr string) (err error) {
router.Use(middleware.Compress(5))
handler := edgeHTTP.NewHandler(s.handlerOptions...)
if err := handler.Load(s.bundle); err != nil {
if err := handler.Load(ctx, s.bundle); err != nil {
return errors.Wrap(err, "could not load app bundle")
}