1. docker
  2. Commit ea11b5f3fe7e6b4153d6e2f7abc5266424a2dafd
Browse code

Move cmd/dockerd/debug to daemon/command/debug

Signed-off-by: Derek McGowan <derek@mcg.dev>

Derek McGowan authored on 2025/05/16 06:02:35
Showing 6 changed files
cmd/dockerd/daemon.go
History View file @ ea11b5f
... ... 
@@ -39,10 +39,10 @@ import (
39 39 
 	buildkit "github.com/docker/docker/builder/builder-next"
40 40 
 	"github.com/docker/docker/builder/builder-next/exporter"
41 41 
 	"github.com/docker/docker/builder/dockerfile"
42 
-	"github.com/docker/docker/cmd/dockerd/debug"
43 42 
 	"github.com/docker/docker/cmd/dockerd/trap"
44 43 
 	"github.com/docker/docker/daemon"
45 44 
 	"github.com/docker/docker/daemon/cluster"
45 
+	"github.com/docker/docker/daemon/command/debug"
46 46 
 	"github.com/docker/docker/daemon/config"
47 47 
 	"github.com/docker/docker/daemon/listeners"
48 48 
 	"github.com/docker/docker/dockerversion"
cmd/dockerd/debug/debug.go
History View file @ ea11b5f
49 49 
deleted file mode 100644
... ... 
@@ -1,26 +0,0 @@
1 
-package debug
2 
-
3 
-import (
4 
-	"os"
5 
-
6 
-	"github.com/containerd/log"
7 
-)
8 
-
9 
-// Enable sets the DEBUG env var to true
10 
-// and makes the logger to log at debug level.
11 
-func Enable() {
12 
-	os.Setenv("DEBUG", "1")
13 
-	_ = log.SetLevel("debug")
14 
-}
15 
-
16 
-// Disable sets the DEBUG env var to false
17 
-// and makes the logger to log at info level.
18 
-func Disable() {
19 
-	os.Setenv("DEBUG", "")
20 
-	_ = log.SetLevel("info")
21 
-}
22 
-
23 
-// IsEnabled checks whether the debug flag is set or not.
24 
-func IsEnabled() bool {
25 
-	return os.Getenv("DEBUG") != ""
26 
-}
cmd/dockerd/debug/debug_test.go
History View file @ ea11b5f
27 1 
deleted file mode 100644
... ... 
@@ -1,43 +0,0 @@
1 
-package debug
2 
-
3 
-import (
4 
-	"os"
5 
-	"testing"
6 
-
7 
-	"github.com/containerd/log"
8 
-)
9 
-
10 
-func TestEnable(t *testing.T) {
11 
-	t.Cleanup(func() {
12 
-		_ = os.Setenv("DEBUG", "")
13 
-		_ = log.SetLevel("info")
14 
-	})
15 
-	Enable()
16 
-	if debug := os.Getenv("DEBUG"); debug != "1" {
17 
-		t.Fatalf("expected DEBUG=1, got %s", debug)
18 
-	}
19 
-	if lvl := log.GetLevel(); lvl != log.DebugLevel {
20 
-		t.Fatalf("expected log level %v, got %v", log.DebugLevel, lvl)
21 
-	}
22 
-}
23 
-
24 
-func TestDisable(t *testing.T) {
25 
-	Disable()
26 
-	if debug := os.Getenv("DEBUG"); debug != "" {
27 
-		t.Fatalf(`expected DEBUG="", got %s`, debug)
28 
-	}
29 
-	if lvl := log.GetLevel(); lvl != log.InfoLevel {
30 
-		t.Fatalf("expected log level %v, got %v", log.InfoLevel, lvl)
31 
-	}
32 
-}
33 
-
34 
-func TestEnabled(t *testing.T) {
35 
-	Enable()
36 
-	if !IsEnabled() {
37 
-		t.Fatal("expected debug enabled, got false")
38 
-	}
39 
-	Disable()
40 
-	if IsEnabled() {
41 
-		t.Fatal("expected debug disabled, got true")
42 
-	}
43 
-}
daemon/command/debug/debug.go
History View file @ ea11b5f
44 1 
new file mode 100644
... ... 
@@ -0,0 +1,26 @@
0 
+package debug
1 
+
2 
+import (
3 
+	"os"
4 
+
5 
+	"github.com/containerd/log"
6 
+)
7 
+
8 
+// Enable sets the DEBUG env var to true
9 
+// and makes the logger to log at debug level.
10 
+func Enable() {
11 
+	os.Setenv("DEBUG", "1")
12 
+	_ = log.SetLevel("debug")
13 
+}
14 
+
15 
+// Disable sets the DEBUG env var to false
16 
+// and makes the logger to log at info level.
17 
+func Disable() {
18 
+	os.Setenv("DEBUG", "")
19 
+	_ = log.SetLevel("info")
20 
+}
21 
+
22 
+// IsEnabled checks whether the debug flag is set or not.
23 
+func IsEnabled() bool {
24 
+	return os.Getenv("DEBUG") != ""
25 
+}
daemon/command/debug/debug_test.go
History View file @ ea11b5f
0 26 
new file mode 100644
... ... 
@@ -0,0 +1,43 @@
0 
+package debug
1 
+
2 
+import (
3 
+	"os"
4 
+	"testing"
5 
+
6 
+	"github.com/containerd/log"
7 
+)
8 
+
9 
+func TestEnable(t *testing.T) {
10 
+	t.Cleanup(func() {
11 
+		_ = os.Setenv("DEBUG", "")
12 
+		_ = log.SetLevel("info")
13 
+	})
14 
+	Enable()
15 
+	if debug := os.Getenv("DEBUG"); debug != "1" {
16 
+		t.Fatalf("expected DEBUG=1, got %s", debug)
17 
+	}
18 
+	if lvl := log.GetLevel(); lvl != log.DebugLevel {
19 
+		t.Fatalf("expected log level %v, got %v", log.DebugLevel, lvl)
20 
+	}
21 
+}
22 
+
23 
+func TestDisable(t *testing.T) {
24 
+	Disable()
25 
+	if debug := os.Getenv("DEBUG"); debug != "" {
26 
+		t.Fatalf(`expected DEBUG="", got %s`, debug)
27 
+	}
28 
+	if lvl := log.GetLevel(); lvl != log.InfoLevel {
29 
+		t.Fatalf("expected log level %v, got %v", log.InfoLevel, lvl)
30 
+	}
31 
+}
32 
+
33 
+func TestEnabled(t *testing.T) {
34 
+	Enable()
35 
+	if !IsEnabled() {
36 
+		t.Fatal("expected debug enabled, got false")
37 
+	}
38 
+	Disable()
39 
+	if IsEnabled() {
40 
+		t.Fatal("expected debug disabled, got true")
41 
+	}
42 
+}
daemon/info.go
History View file @ ea11b5f
... ... 
@@ -17,7 +17,7 @@ import (
17 17 
 	"github.com/docker/docker/api"
18 18 
 	"github.com/docker/docker/api/types"
19 19 
 	"github.com/docker/docker/api/types/system"
20 
-	"github.com/docker/docker/cmd/dockerd/debug"
20 
+	"github.com/docker/docker/daemon/command/debug"
21 21 
 	"github.com/docker/docker/daemon/config"
22 22 
 	"github.com/docker/docker/daemon/internal/filedescriptors"
23 23 
 	"github.com/docker/docker/daemon/logger"