Migrations/neko-rooms
1
0
Fork 0
mirror of https://github.com/m1k1o/neko-rooms.git synced 2026-11-02 22:51:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

add stop timeout to config.

Browse Source
This commit is contained in:
Miroslav Šedivý
2023-12-23 02:22:45 +01:00
parent a844a9f9d2
commit 74fe2d7eab
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/config/room.go
+7
View File
@@ -32,6 +32,7 @@ type Room struct {
PathPrefix string
Labels []string
WaitEnabled bool
StopTimeoutSec int
StorageEnabled bool
StorageInternal string
@@ -100,6 +101,11 @@ func (Room) Init(cmd *cobra.Command) error {
return err
}
cmd.PersistentFlags().Int("stop_timeout", 10, "timeout in seconds for stopping the room with SIGTERM, after that SIGKILL is used (0 to disable, -1 to wait forever)")
if err := viper.BindPFlag("stop_timeout", cmd.PersistentFlags().Lookup("stop_timeout")); err != nil {
return err
}
// Data
cmd.PersistentFlags().Bool("storage.enabled", true, "whether storage is enabled, where peristent containers data will be stored")
@@ -207,6 +213,7 @@ func (s *Room) Set() {
s.PathPrefix = path.Join("/", path.Clean(viper.GetString("path_prefix")))
s.Labels = viper.GetStringSlice("labels")
s.WaitEnabled = viper.GetBool("wait_enabled")
s.StopTimeoutSec = viper.GetInt("stop_timeout")
s.StorageEnabled = viper.GetBool("storage.enabled")
s.StorageInternal = viper.GetString("storage.internal")
internal/room/manager.go
+12 -3
View File
@@ -724,7 +724,10 @@ func (manager *RoomManagerCtx) Remove(ctx context.Context, id string) error {
}
// Stop the actual container
err = manager.client.ContainerStop(ctx, id, container.StopOptions{})
err = manager.client.ContainerStop(ctx, id, container.StopOptions{
Signal: "SIGTERM",
Timeout: &manager.config.StopTimeoutSec,
})
if err != nil {
return err
@@ -998,7 +1001,10 @@ func (manager *RoomManagerCtx) Stop(ctx context.Context, id string) error {
}
// Stop the actual container
return manager.client.ContainerStop(ctx, id, container.StopOptions{})
return manager.client.ContainerStop(ctx, id, container.StopOptions{
Signal: "SIGTERM",
Timeout: &manager.config.StopTimeoutSec,
})
}
func (manager *RoomManagerCtx) Restart(ctx context.Context, id string) error {
@@ -1008,7 +1014,10 @@ func (manager *RoomManagerCtx) Restart(ctx context.Context, id string) error {
}
// Restart the actual container
return manager.client.ContainerRestart(ctx, id, container.StopOptions{})
return manager.client.ContainerRestart(ctx, id, container.StopOptions{
Signal: "SIGTERM",
Timeout: &manager.config.StopTimeoutSec,
})
}
// events