Skip to content

Commit 0122e43

Browse files
committed
improve readability of markDevcontainerDirty
1 parent 1aa6a48 commit 0122e43

File tree

1 file changed

+15
-17
lines changed

1 file changed

+15
-17
lines changed

agent/agentcontainers/api.go

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -662,30 +662,28 @@ func (api *API) markDevcontainerDirty(configPath string, modifiedAt time.Time) {
662662
api.configFileModifiedTimes[configPath] = modifiedAt
663663

664664
for i := range api.knownDevcontainers {
665-
if api.knownDevcontainers[i].ConfigPath != configPath {
665+
dc := &api.knownDevcontainers[i]
666+
if dc.ConfigPath != configPath {
666667
continue
667668
}
668669

670+
logger := api.logger.With(
671+
slog.F("file", configPath),
672+
slog.F("name", dc.Name),
673+
slog.F("workspace_folder", dc.WorkspaceFolder),
674+
slog.F("modified_at", modifiedAt),
675+
)
676+
669677
// TODO(mafredri): Simplistic mark for now, we should check if the
670678
// container is running and if the config file was modified after
671679
// the container was created.
672-
if !api.knownDevcontainers[i].Dirty {
673-
api.logger.Info(api.ctx, "marking devcontainer as dirty",
674-
slog.F("file", configPath),
675-
slog.F("name", api.knownDevcontainers[i].Name),
676-
slog.F("workspace_folder", api.knownDevcontainers[i].WorkspaceFolder),
677-
slog.F("modified_at", modifiedAt),
678-
)
679-
api.knownDevcontainers[i].Dirty = true
680+
if !dc.Dirty {
681+
logger.Info(api.ctx, "marking devcontainer as dirty")
682+
dc.Dirty = true
680683
}
681-
if api.knownDevcontainers[i].Container != nil && !api.knownDevcontainers[i].Container.DevcontainerDirty {
682-
api.logger.Info(api.ctx, "marking devcontainer container as dirty",
683-
slog.F("file", configPath),
684-
slog.F("name", api.knownDevcontainers[i].Name),
685-
slog.F("workspace_folder", api.knownDevcontainers[i].WorkspaceFolder),
686-
slog.F("modified_at", modifiedAt),
687-
)
688-
api.knownDevcontainers[i].Container.DevcontainerDirty = true
684+
if dc.Container != nil && !dc.Container.DevcontainerDirty {
685+
logger.Info(api.ctx, "marking devcontainer container as dirty")
686+
dc.Container.DevcontainerDirty = true
689687
}
690688
}
691689
}

0 commit comments

Comments
 (0)