fixed idlewatcher panic, dashboard app name, route not removing on container destroy

This commit is contained in:
yusing
2024-10-16 00:57:10 +08:00
parent 56b778f19c
commit c0c61709ca
10 changed files with 53 additions and 56 deletions

View File

@@ -28,6 +28,7 @@ var (
DockerFilterStart = filters.Arg("event", string(docker_events.ActionStart))
DockerFilterStop = filters.Arg("event", string(docker_events.ActionStop))
DockerFilterDie = filters.Arg("event", string(docker_events.ActionDie))
DockerFilterDestroy = filters.Arg("event", string(docker_events.ActionDestroy))
DockerFilterKill = filters.Arg("event", string(docker_events.ActionKill))
DockerFilterPause = filters.Arg("event", string(docker_events.ActionPause))
DockerFilterUnpause = filters.Arg("event", string(docker_events.ActionUnPause))
@@ -97,12 +98,8 @@ func (w DockerWatcher) EventsWithOptions(ctx context.Context, options DockerList
defer w.client.Close()
w.Debugf("client connected")
cEventCh, cErrCh := w.client.Events(ctx, options)
w.Debugf("watcher started")
for {
select {
case <-ctx.Done():
@@ -148,4 +145,5 @@ var optionsWatchAll = DockerListOptions{Filters: NewDockerFilter(
DockerFilterStart,
// DockerFilterStop,
DockerFilterDie,
DockerFilterDestroy,
)}

View File

@@ -32,6 +32,7 @@ const (
ActionContainerStop
ActionContainerPause
ActionContainerDie
ActionContainerDestroy
actionContainerWakeMask = ActionContainerCreate | ActionContainerStart | ActionContainerUnpause
actionContainerSleepMask = ActionContainerKill | ActionContainerStop | ActionContainerPause | ActionContainerDie
@@ -47,10 +48,11 @@ var DockerEventMap = map[dockerEvents.Action]Action{
dockerEvents.ActionStart: ActionContainerStart,
dockerEvents.ActionUnPause: ActionContainerUnpause,
dockerEvents.ActionKill: ActionContainerKill,
dockerEvents.ActionStop: ActionContainerStop,
dockerEvents.ActionPause: ActionContainerPause,
dockerEvents.ActionDie: ActionContainerDie,
dockerEvents.ActionKill: ActionContainerKill,
dockerEvents.ActionStop: ActionContainerStop,
dockerEvents.ActionPause: ActionContainerPause,
dockerEvents.ActionDie: ActionContainerDie,
dockerEvents.ActionDestroy: ActionContainerDestroy,
}
var fileActionNameMap = map[Action]string{

View File

@@ -127,7 +127,7 @@ func (mon *monitor) String() string {
func (mon *monitor) MarshalJSON() ([]byte, error) {
return (&JSONRepresentation{
Name: mon.Name(),
Name: mon.service,
Config: mon.config,
Status: mon.status.Load(),
Started: mon.startTime,