Merge 4bc4c93 into backport/docker_logger_memory/recently-funky-lemur

hashicorp · Oct 11, 2022 · 4a555e9 · 4a555e9
2 parents b764ce4 + 4bc4c93
commit 4a555e9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.changelog/14875.txt b/.changelog/14875.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+docker: improve memory usage for docker_logger
+```
diff --git a/main.go b/main.go
@@ -12,11 +12,13 @@ import (
 	// These packages have init() funcs which check os.Args and drop directly
 	// into their command logic. This is because they are run as separate
 	// processes along side of a task. By early importing them we can avoid
-	// additional code being imported and thus reserving memory
+	// additional code being imported and thus reserving memory.
 	_ "github.com/hashicorp/nomad/client/logmon"
-	"github.com/hashicorp/nomad/command"
 	_ "github.com/hashicorp/nomad/drivers/docker/docklog"
 	_ "github.com/hashicorp/nomad/drivers/shared/executor"
+
+	// Don't move any other code imports above the import block above!
+	"github.com/hashicorp/nomad/command"
 	"github.com/hashicorp/nomad/version"
 	"github.com/mitchellh/cli"
 	"github.com/sean-/seed"