feat: http logging middleware + mcp random port (#74)
This commit is contained in:
@@ -14,6 +14,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/kandev/kandev/internal/common/httpmw"
|
||||
"go.uber.org/zap"
|
||||
|
||||
// Common packages
|
||||
@@ -648,6 +649,7 @@ func main() {
|
||||
gin.SetMode(gin.ReleaseMode)
|
||||
}
|
||||
router := gin.New()
|
||||
router.Use(httpmw.RequestLogger(log, "kandev"))
|
||||
router.Use(gin.Recovery())
|
||||
router.Use(corsMiddleware())
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ import (
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/kandev/kandev/internal/agentctl/server/config"
|
||||
"github.com/kandev/kandev/internal/agentctl/server/instance"
|
||||
"github.com/kandev/kandev/internal/common/httpmw"
|
||||
"github.com/kandev/kandev/internal/common/logger"
|
||||
"go.uber.org/zap"
|
||||
)
|
||||
@@ -33,6 +34,8 @@ func NewControlServer(cfg *config.Config, instMgr *instance.Manager, log *logger
|
||||
router: gin.New(),
|
||||
}
|
||||
|
||||
cs.router.Use(httpmw.RequestLogger(cs.logger, "agentctl-control"))
|
||||
|
||||
cs.setupRoutes()
|
||||
return cs
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@ import (
|
||||
"github.com/gorilla/websocket"
|
||||
"github.com/kandev/kandev/internal/agentctl/server/config"
|
||||
"github.com/kandev/kandev/internal/agentctl/server/process"
|
||||
"github.com/kandev/kandev/internal/common/httpmw"
|
||||
"github.com/kandev/kandev/internal/common/logger"
|
||||
"go.uber.org/zap"
|
||||
)
|
||||
@@ -39,6 +40,8 @@ func NewServer(cfg *config.InstanceConfig, procMgr *process.Manager, log *logger
|
||||
},
|
||||
}
|
||||
|
||||
s.router.Use(httpmw.RequestLogger(s.logger, "agentctl-instance"))
|
||||
|
||||
s.setupRoutes()
|
||||
return s
|
||||
}
|
||||
|
||||
@@ -212,6 +212,8 @@ func LoadWithPath(configPath string) (*Config, error) {
|
||||
// so we explicitly bind keys where env var naming differs from config key naming.
|
||||
_ = v.BindEnv("agent.standalonePort", "AGENTCTL_PORT", "KANDEV_AGENT_STANDALONE_PORT")
|
||||
_ = v.BindEnv("agent.standaloneHost", "KANDEV_AGENT_STANDALONE_HOST")
|
||||
_ = v.BindEnv("agent.mcpServerPort", "KANDEV_AGENT_MCP_SERVER_PORT")
|
||||
_ = v.BindEnv("agent.mcpServerUrl", "KANDEV_AGENT_MCP_SERVER_URL")
|
||||
|
||||
// Configure config file
|
||||
v.SetConfigName("config")
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
package httpmw
|
||||
|
||||
import (
|
||||
"time"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/kandev/kandev/internal/common/logger"
|
||||
"go.uber.org/zap"
|
||||
)
|
||||
|
||||
// RequestLogger logs HTTP request details after the handler completes.
|
||||
func RequestLogger(log *logger.Logger, serverName string) gin.HandlerFunc {
|
||||
return func(c *gin.Context) {
|
||||
start := time.Now()
|
||||
path := c.FullPath()
|
||||
if path == "" {
|
||||
path = c.Request.URL.Path
|
||||
}
|
||||
|
||||
c.Next()
|
||||
|
||||
latency := time.Since(start)
|
||||
status := c.Writer.Status()
|
||||
size := c.Writer.Size()
|
||||
if size < 0 {
|
||||
size = 0
|
||||
}
|
||||
|
||||
log.Info("http",
|
||||
zap.String("server", serverName),
|
||||
zap.String("method", c.Request.Method),
|
||||
zap.String("path", path),
|
||||
zap.Int("status", status),
|
||||
zap.Int64("duration_ms", latency.Milliseconds()),
|
||||
zap.Int("bytes", size),
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -88,6 +88,9 @@ func (s *Server) Start(ctx context.Context) error {
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to listen on %s: %w", addr, err)
|
||||
}
|
||||
if tcpAddr, ok := listener.Addr().(*net.TCPAddr); ok {
|
||||
s.cfg.Port = tcpAddr.Port
|
||||
}
|
||||
|
||||
// Create HTTP server with the mux
|
||||
s.httpServer = &http.Server{
|
||||
@@ -174,4 +177,3 @@ func (s *Server) SSEEndpoint() string {
|
||||
func (s *Server) StreamableHTTPEndpoint() string {
|
||||
return fmt.Sprintf("http://localhost:%d/mcp", s.cfg.Port)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user