Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions go/brotli.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ func (b *brotliWriter) Write(data []byte) (
b.Header().Del("Content-Length")

if !b.statusWritten {
b.status = b.Status()
b.status = b.Status()
}

if b.status >= http.StatusBadRequest {
Expand Down Expand Up @@ -172,7 +172,7 @@ func (b *brotliWriter) WriteHeaderNow() {
}

if !b.statusWritten {
b.status = b.Status()
b.status = b.Status()
b.statusWritten = true
}
b.Header().Del("Content-Length")
Expand Down Expand Up @@ -210,15 +210,15 @@ func (b *brotliWriter) release(pool *sync.Pool) {
b.Header().Del("Content-Encoding")
b.Header().Del("Vary")
b.writer.Reset(io.Discard)
} else if b.Size() < 0 {
} else if b.Size() < 0 {
b.writer.Reset(io.Discard)
}
if err := b.writer.Close(); err != nil {
b.Header().Del("Content-Length")
}
if b.Size() > -1 {
b.Header().Set("Content-Length", core.Sprintf("%d", b.Size()))
}
if b.Size() > -1 {
b.Header().Set("Content-Length", core.Sprintf("%d", b.Size()))
}
b.writer.Reset(io.Discard)
pool.Put(b.writer)
b.writer = nil
Expand Down
12 changes: 6 additions & 6 deletions go/chat_completions.go
Original file line number Diff line number Diff line change
Expand Up @@ -833,9 +833,9 @@ func (h *chatCompletionsHandler) serveStreaming(c *gin.Context, model inference.
},
},
}
encoded := core.JSONMarshalString(primingChunk)
_, _ = c.Writer.WriteString(core.Sprintf("data: %s\n\n", encoded))
c.Writer.Flush()
encoded := core.JSONMarshalString(primingChunk)
_, _ = c.Writer.WriteString(core.Sprintf("data: %s\n\n", encoded))
c.Writer.Flush()

streamStarted = true
}
Expand Down Expand Up @@ -880,9 +880,9 @@ func (h *chatCompletionsHandler) serveStreaming(c *gin.Context, model inference.
chunk.Thought = &t
}

encoded := core.JSONMarshalString(chunk)
_, _ = c.Writer.WriteString(core.Sprintf("data: %s\n\n", encoded))
c.Writer.Flush()
encoded := core.JSONMarshalString(chunk)
_, _ = c.Writer.WriteString(core.Sprintf("data: %s\n\n", encoded))
c.Writer.Flush()
if stopHit {
emittedContent = candidateContent[:stopCut]
} else {
Expand Down
4 changes: 3 additions & 1 deletion go/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,9 @@ func (c *OpenAPIClient) Call(operationID string, params any) (
return nil, err
}
defer func() {
_ = resp.Body.Close()
if closeErr := resp.Body.Close(); closeErr != nil {
core.Error("openapi response body close failed", "err", closeErr)
}
}()

payload, err := io.ReadAll(resp.Body)
Expand Down
8 changes: 6 additions & 2 deletions go/cmd/gateway/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ func run(args []string, stdout io.Writer, stderr io.Writer) int {
logger := slog.New(slog.NewTextHandler(stderr, nil))
c := core.New()
defer func() {
_ = c.ServiceShutdown(context.Background())
if r := c.ServiceShutdown(context.Background()); !r.OK {
logger.Error("gateway core shutdown failed", "err", r.Error())
}
}()

bind := core.Trim(core.Getenv(envGatewayBind))
Expand Down Expand Up @@ -351,7 +353,9 @@ func displayBasePath(path string) string {
func forwardSignalsToCore(c *core.Core, logger *slog.Logger) func() {
return func() {
if c != nil {
_ = c.ServiceShutdown(context.Background())
if r := c.ServiceShutdown(context.Background()); !r.OK && logger != nil {
logger.Error("gateway signal shutdown failed", "err", r.Error())
}
}
if logger != nil {
logger.Debug("gateway signal bridge stopped")
Expand Down
4 changes: 3 additions & 1 deletion go/entitlements.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ func (b *EntitlementBridge) Check(ctx context.Context, workspaceID, feature stri
return false, core.E(op, "call entitlement service", err)
}
defer func() {
_ = resp.Body.Close()
if closeErr := resp.Body.Close(); closeErr != nil {
core.Error("entitlement response body close failed", "err", closeErr)
}
}()

data, err := io.ReadAll(io.LimitReader(resp.Body, maxEntitlementResponseBytes))
Expand Down
8 changes: 6 additions & 2 deletions go/transport_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,9 @@ func (c *SSEClient) Connect(ctx context.Context) (
}
if resp.StatusCode != http.StatusOK {
defer func() {
_ = resp.Body.Close()
if closeErr := resp.Body.Close(); closeErr != nil {
core.Error("sse response body close failed", "err", closeErr)
}
}()
return nil, coreerr.E("", core.Sprintf("unexpected SSE status %d", resp.StatusCode), nil)
}
Expand Down Expand Up @@ -269,7 +271,9 @@ func (c *SSEClient) Events(ctx context.Context) (
go func() {
defer close(out)
defer func() {
_ = resp.Body.Close()
if closeErr := resp.Body.Close(); closeErr != nil {
core.Error("sse stream body close failed", "err", closeErr)
}
}()
parseSSEStream(ctx, resp.Body, out)
}()
Expand Down
Loading