consolidate log functions in one package (#182)

* consolidate log functions in one package
* Remove --central option
* Make --transport option hidden

Author: slimslenderslacks

cmd/docker-mcp/commands/gateway.go

@@ -86,11 +86,6 @@ func gatewayCommand(docker docker.Client, dockerCli command.Cli) *cobra.Command
 				options.Watch = false
 			}
 
-			if options.Central {
-				options.Watch = false
-				options.Transport = "streaming"
-			}
-
 			if options.Transport == "stdio" {
 				if options.Port != 0 {
 					return errors.New("cannot use --port with --transport=stdio")
@@ -178,10 +173,11 @@ func gatewayCommand(docker docker.Client, dockerCli command.Cli) *cobra.Command
 	runCmd.Flags().IntVar(&options.Cpus, "cpus", options.Cpus, "CPUs allocated to each MCP Server (default is 1)")
 	runCmd.Flags().StringVar(&options.Memory, "memory", options.Memory, "Memory allocated to each MCP Server (default is 2Gb)")
 	runCmd.Flags().BoolVar(&options.Static, "static", options.Static, "Enable static mode (aka pre-started servers)")
+	runCmd.Flags().StringVar(&options.LogFilePath, "log", options.LogFilePath, "Path to log file for stderr output (relative or absolute)")
 
 	// Very experimental features
-	runCmd.Flags().BoolVar(&options.Central, "central", options.Central, "In central mode, clients tell us which servers to enable")
-	_ = runCmd.Flags().MarkHidden("central")
+	_ = runCmd.Flags().MarkHidden("transport")
+	_ = runCmd.Flags().MarkHidden("log")
 
 	cmd.AddCommand(runCmd)
 

docs/generator/reference/docker_mcp_gateway_run.yaml

@@ -76,16 +76,6 @@ options:
       experimentalcli: false
       kubernetes: false
       swarm: false
-    - option: central
-      value_type: bool
-      default_value: "false"
-      description: In central mode, clients tell us which servers to enable
-      deprecated: false
-      hidden: true
-      experimental: false
-      experimentalcli: false
-      kubernetes: false
-      swarm: false
     - option: config
       value_type: stringSlice
       default_value: '[config.yaml]'
@@ -149,6 +139,15 @@ options:
       experimentalcli: false
       kubernetes: false
       swarm: false
+    - option: log
+      value_type: string
+      description: Path to log file for stderr output (relative or absolute)
+      deprecated: false
+      hidden: true
+      experimental: false
+      experimentalcli: false
+      kubernetes: false
+      swarm: false
     - option: log-calls
       value_type: bool
       default_value: "true"
@@ -278,7 +277,7 @@ options:
       default_value: stdio
       description: stdio, sse or streaming (default is stdio)
       deprecated: false
-      hidden: false
+      hidden: true
       experimental: false
       experimentalcli: false
       kubernetes: false

docs/generator/reference/mcp_gateway_run.md

@@ -32,7 +32,6 @@ Run the gateway
 | `--static`                  | `bool`        |                     | Enable static mode (aka pre-started servers)                                                                                                  |
 | `--tools`                   | `stringSlice` |                     | List of tools to enable                                                                                                                       |
 | `--tools-config`            | `stringSlice` | `[tools.yaml]`      | Paths to the tools files (absolute or relative to ~/.docker/mcp/)                                                                             |
-| `--transport`               | `string`      | `stdio`             | stdio, sse or streaming (default is stdio)                                                                                                    |
 | `--verbose`                 | `bool`        |                     | Verbose output                                                                                                                                |
 | `--verify-signatures`       | `bool`        |                     | Verify signatures of the server images                                                                                                        |
 | `--watch`                   | `bool`        | `true`              | Watch for changes and reconfigure the gateway                                                                                                 |

pkg/docker/logs.go

@@ -11,6 +11,7 @@ import (
 	"strings"
 
 	"github.com/docker/mcp-gateway/pkg/desktop"
+	"github.com/docker/mcp-gateway/pkg/log"
 )
 
 const jcatImage = "docker/jcat@sha256:76719466e8b99a65dd1d37d9ab94108851f009f0f687dce7ff8a6fc90575c4d4"
@@ -100,7 +101,7 @@ func (c *dockerClient) readSecretsOneByOneOptional(ctx context.Context, names []
 	for _, name := range names {
 		values, err := c.readSecrets(ctx, []string{name})
 		if err != nil {
-			logf("couldn't read secret %s: %v", name, err)
+			log.Logf("couldn't read secret %s: %v", name, err)
 			continue
 		}
 

pkg/docker/secrets.go

@@ -12,6 +12,7 @@ import (
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 	"golang.org/x/sync/errgroup"
 
+	"github.com/docker/mcp-gateway/pkg/log"
 	"github.com/docker/mcp-gateway/pkg/telemetry"
 )
 
@@ -95,14 +96,14 @@ func (g *Gateway) listCapabilities(ctx context.Context, configuration Configurat
 
 		switch {
 		case !found:
-			log("  - MCP server not found:", serverName)
+			log.Log("  - MCP server not found:", serverName)
 
 		// It's an MCP Server
 		case serverConfig != nil:
 			errs.Go(func() error {
 				client, err := g.clientPool.AcquireClient(ctx, serverConfig, clientConfig)
 				if err != nil {
-					logf("  > Can't start %s: %s", serverConfig.Name, err)
+					log.Logf("  > Can't start %s: %s", serverConfig.Name, err)
 					return nil
 				}
 				defer g.clientPool.ReleaseClient(client)
@@ -111,7 +112,7 @@ func (g *Gateway) listCapabilities(ctx context.Context, configuration Configurat
 
 				tools, err := client.Session().ListTools(ctx, &mcp.ListToolsParams{})
 				if err != nil {
-					logf("  > Can't list tools %s: %s", serverConfig.Name, err)
+					log.Logf("  > Can't list tools %s: %s", serverConfig.Name, err)
 				} else {
 					// Record the number of tools discovered from this server
 					telemetry.RecordToolList(ctx, serverConfig.Name, len(tools.Tools))
@@ -170,21 +171,21 @@ func (g *Gateway) listCapabilities(ctx context.Context, configuration Configurat
 					}
 				}
 
-				var log string
+				var logMsg string
 				if len(capabilities.Tools) > 0 {
-					log += fmt.Sprintf(" (%d tools)", len(capabilities.Tools))
+					logMsg += fmt.Sprintf(" (%d tools)", len(capabilities.Tools))
 				}
 				if len(capabilities.Prompts) > 0 {
-					log += fmt.Sprintf(" (%d prompts)", len(capabilities.Prompts))
+					logMsg += fmt.Sprintf(" (%d prompts)", len(capabilities.Prompts))
 				}
 				if len(capabilities.Resources) > 0 {
-					log += fmt.Sprintf(" (%d resources)", len(capabilities.Resources))
+					logMsg += fmt.Sprintf(" (%d resources)", len(capabilities.Resources))
 				}
 				if len(capabilities.ResourceTemplates) > 0 {
-					log += fmt.Sprintf(" (%d resourceTemplates)", len(capabilities.ResourceTemplates))
+					logMsg += fmt.Sprintf(" (%d resourceTemplates)", len(capabilities.ResourceTemplates))
 				}
-				if log != "" {
-					logf("  > %s:%s", serverConfig.Name, log)
+				if logMsg != "" {
+					log.Logf("  > %s:%s", serverConfig.Name, logMsg)
 				}
 
 				lock.Lock()

pkg/gateway/capabilitites.go

@@ -14,6 +14,7 @@ import (
 	"github.com/docker/mcp-gateway/pkg/docker"
 	"github.com/docker/mcp-gateway/pkg/eval"
 	"github.com/docker/mcp-gateway/pkg/gateway/proxies"
+	"github.com/docker/mcp-gateway/pkg/log"
 	mcpclient "github.com/docker/mcp-gateway/pkg/mcp"
 )
 
@@ -165,23 +166,23 @@ func (cp *clientPool) InvalidateOAuthClients(provider string) {
 	cp.clientLock.Lock()
 	defer cp.clientLock.Unlock()
 
-	log(fmt.Sprintf("ClientPool: Invalidating OAuth clients for provider: %s", provider))
+	log.Log(fmt.Sprintf("ClientPool: Invalidating OAuth clients for provider: %s", provider))
 
 	var invalidatedKeys []clientKey
 	for key, keptClient := range cp.keptClients {
 		// Check if this client uses OAuth for the specified provider
 		if keptClient.Config.Spec.OAuth != nil {
 			// Match by server name (for DCR providers, server name matches provider)
 			if keptClient.Config.Name == provider {
-				log(fmt.Sprintf("ClientPool: Closing OAuth connection for server: %s", keptClient.Config.Name))
+				log.Log(fmt.Sprintf("ClientPool: Closing OAuth connection for server: %s", keptClient.Config.Name))
 
 				// Close the connection
 				client, err := keptClient.Getter.GetClient(context.TODO())
 				if err == nil {
 					client.Session().Close()
-					log(fmt.Sprintf("ClientPool: Successfully closed connection for %s", keptClient.Config.Name))
+					log.Log(fmt.Sprintf("ClientPool: Successfully closed connection for %s", keptClient.Config.Name))
 				} else {
-					log(fmt.Sprintf("ClientPool: Warning - failed to get client for %s during invalidation: %v", keptClient.Config.Name, err))
+					log.Log(fmt.Sprintf("ClientPool: Warning - failed to get client for %s during invalidation: %v", keptClient.Config.Name, err))
 				}
 
 				// Mark for removal from kept clients
@@ -196,9 +197,9 @@ func (cp *clientPool) InvalidateOAuthClients(provider string) {
 	}
 
 	if len(invalidatedKeys) > 0 {
-		log(fmt.Sprintf("ClientPool: Invalidated %d OAuth connections for provider %s", len(invalidatedKeys), provider))
+		log.Log(fmt.Sprintf("ClientPool: Invalidated %d OAuth connections for provider %s", len(invalidatedKeys), provider))
 	} else {
-		log(fmt.Sprintf("ClientPool: No active OAuth connections found for provider %s", provider))
+		log.Log(fmt.Sprintf("ClientPool: No active OAuth connections found for provider %s", provider))
 	}
 }
 
@@ -240,7 +241,7 @@ func (cp *clientPool) runToolContainer(ctx context.Context, tool catalog.Tool, p
 	command := eval.EvaluateList(tool.Container.Command, arguments)
 	args = append(args, command...)
 
-	log("  - Running container", tool.Container.Image, "with args", args)
+	log.Log("  - Running container", tool.Container.Image, "with args", args)
 
 	cmd := exec.CommandContext(ctx, "docker", args...)
 	if cp.Verbose {
@@ -325,7 +326,7 @@ func (cp *clientPool) argsAndEnv(serverConfig *catalog.ServerConfig, readOnly *b
 		if ok {
 			env = append(env, fmt.Sprintf("%s=%s", s.Env, secretValue))
 		} else {
-			logf("Warning: Secret '%s' not found for server '%s', setting %s=<UNKNOWN>", s.Name, serverConfig.Name, s.Env)
+			log.Logf("Warning: Secret '%s' not found for server '%s', setting %s=<UNKNOWN>", s.Name, serverConfig.Name, s.Env)
 			env = append(env, fmt.Sprintf("%s=%s", s.Env, "<UNKNOWN>"))
 		}
 	}
@@ -446,9 +447,9 @@ func (cg *clientGetter) GetClient(ctx context.Context) (mcpclient.Client, error)
 
 				command := expandEnvList(eval.EvaluateList(cg.serverConfig.Spec.Command, cg.serverConfig.Config), env)
 				if len(command) == 0 {
-					log("  - Running", imageBaseName(image), "with", args)
+					log.Log("  - Running", imageBaseName(image), "with", args)
 				} else {
-					log("  - Running", imageBaseName(image), "with", args, "and command", command)
+					log.Log("  - Running", imageBaseName(image), "with", args, "and command", command)
 				}
 
 				var runArgs []string

pkg/gateway/clientpool.go

@@ -31,8 +31,8 @@ type Options struct {
 	Cpus                    int
 	Memory                  string
 	Static                  bool
-	Central                 bool
 	OAuthInterceptorEnabled bool
 	McpOAuthDcrEnabled      bool
 	DynamicTools            bool
+	LogFilePath             string
 }