Skip to content

daemon: assorted cleanups and minor improvements#48244

Merged
thaJeztah merged 5 commits intomoby:masterfrom
thaJeztah:cleanup_cleanups
Jul 29, 2024
Merged

daemon: assorted cleanups and minor improvements#48244
thaJeztah merged 5 commits intomoby:masterfrom
thaJeztah:cleanup_cleanups

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

daemon: move sortMounts to a platform-agnostic file

The same code was used both on Linux and Windows; move it to a platform-
agnostic file so that both can use this function, which contains GoDoc
describing the functionality.

daemon: rename "mounts" type to reduce shadowing

Use a more distinct name, so that local variables can use it. While
at it, also added GoDoc to describe its functionality.

daemon: setupMounts: rename var that shadowed import

The cleanups var collided with the cleanups import; rename it to use
the same name as is used in the Windows implementation.

daemon: openContainerFS: rename output var

daemon: openContainerFS: log cleanup errors

These errors were unhandled; log them (at debug level for now).

The same code was used both on Linux and Windows; move it to a platform-
agnostic file so that both can use this function, which contains GoDoc
describing the functionality.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Use a more distinct name, so that local variables can use it. While
at it, also added GoDoc to describe its functionality.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
The cleanups var collided with the cleanups import; rename it to use
the same name as is used in the Windows implementation.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
These errors were unhandled; log them (at debug level for now).

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added status/2-code-review area/daemon Core Engine kind/refactor PR's that refactor, or clean-up code labels Jul 26, 2024
@thaJeztah thaJeztah added this to the 28.0.0 milestone Jul 26, 2024
@thaJeztah thaJeztah self-assigned this Jul 26, 2024
@thaJeztah thaJeztah merged commit 0c513d2 into moby:master Jul 29, 2024
@thaJeztah thaJeztah deleted the cleanup_cleanups branch July 29, 2024 17:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/daemon Core Engine kind/refactor PR's that refactor, or clean-up code status/2-code-review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants