558801db1a
* Fix nginx proxy buffering for streaming endpoints - Add X-Accel-Buffering: no header to SSE endpoints (/api/events, /logs/stream) - Add X-Accel-Buffering: no header to proxied text/event-stream responses - Add nginx reverse proxy configuration section to README - Add tests for X-Accel-Buffering header on streaming endpoints Fixes #236 * Fix goroutine cleanup in streaming endpoints test Add context cancellation to TestProxyManager_StreamingEndpointsReturnNoBufferingHeader to ensure the goroutine is properly cleaned up when the test completes.
101 lines
2.2 KiB
Go
101 lines
2.2 KiB
Go
package proxy
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
func (pm *ProxyManager) sendLogsHandlers(c *gin.Context) {
|
|
accept := c.GetHeader("Accept")
|
|
if strings.Contains(accept, "text/html") {
|
|
c.Redirect(http.StatusFound, "/ui/")
|
|
} else {
|
|
c.Header("Content-Type", "text/plain")
|
|
history := pm.muxLogger.GetHistory()
|
|
_, err := c.Writer.Write(history)
|
|
if err != nil {
|
|
c.AbortWithError(http.StatusInternalServerError, err)
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
func (pm *ProxyManager) streamLogsHandler(c *gin.Context) {
|
|
c.Header("Content-Type", "text/plain")
|
|
c.Header("Transfer-Encoding", "chunked")
|
|
c.Header("X-Content-Type-Options", "nosniff")
|
|
// prevent nginx from buffering streamed logs
|
|
c.Header("X-Accel-Buffering", "no")
|
|
|
|
logMonitorId := c.Param("logMonitorID")
|
|
logger, err := pm.getLogger(logMonitorId)
|
|
if err != nil {
|
|
c.String(http.StatusBadRequest, err.Error())
|
|
return
|
|
}
|
|
|
|
flusher, ok := c.Writer.(http.Flusher)
|
|
if !ok {
|
|
c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("streaming unsupported"))
|
|
return
|
|
}
|
|
|
|
_, skipHistory := c.GetQuery("no-history")
|
|
// Send history first if not skipped
|
|
|
|
if !skipHistory {
|
|
history := logger.GetHistory()
|
|
if len(history) != 0 {
|
|
c.Writer.Write(history)
|
|
flusher.Flush()
|
|
}
|
|
}
|
|
|
|
sendChan := make(chan []byte, 10)
|
|
ctx, cancel := context.WithCancel(c.Request.Context())
|
|
defer logger.OnLogData(func(data []byte) {
|
|
select {
|
|
case sendChan <- data:
|
|
case <-ctx.Done():
|
|
return
|
|
default:
|
|
}
|
|
})()
|
|
|
|
for {
|
|
select {
|
|
case <-c.Request.Context().Done():
|
|
cancel()
|
|
return
|
|
case <-pm.shutdownCtx.Done():
|
|
cancel()
|
|
return
|
|
case data := <-sendChan:
|
|
c.Writer.Write(data)
|
|
flusher.Flush()
|
|
}
|
|
}
|
|
}
|
|
|
|
// getLogger searches for the appropriate logger based on the logMonitorId
|
|
func (pm *ProxyManager) getLogger(logMonitorId string) (*LogMonitor, error) {
|
|
var logger *LogMonitor
|
|
|
|
if logMonitorId == "" {
|
|
// maintain the default
|
|
logger = pm.muxLogger
|
|
} else if logMonitorId == "proxy" {
|
|
logger = pm.proxyLogger
|
|
} else if logMonitorId == "upstream" {
|
|
logger = pm.upstreamLogger
|
|
} else {
|
|
return nil, fmt.Errorf("invalid logger. Use 'proxy' or 'upstream'")
|
|
}
|
|
|
|
return logger, nil
|
|
}
|