mirror of
https://github.com/sablierapp/sablier.git
synced 2025-12-21 13:23:03 +01:00
fix: bump go 1.25 (#723)
* fix: bump go 1.25 also bump deps and fix golangci lint * golangci lint fixes
This commit is contained in:
@@ -4,12 +4,13 @@ import (
|
||||
"bufio"
|
||||
"bytes"
|
||||
"errors"
|
||||
"github.com/sablierapp/sablier/pkg/sablier"
|
||||
"sort"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/sablierapp/sablier/pkg/sablier"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/sablierapp/sablier/pkg/theme"
|
||||
)
|
||||
@@ -89,12 +90,18 @@ func StartDynamic(router *gin.RouterGroup, s *ServeStrategy) {
|
||||
AbortWithProblemDetail(c, ProblemThemeNotFound(themeNotFound))
|
||||
return
|
||||
}
|
||||
writer.Flush()
|
||||
if err := writer.Flush(); err != nil {
|
||||
AbortWithProblemDetail(c, ProblemError(err))
|
||||
return
|
||||
}
|
||||
|
||||
c.Header("Cache-Control", "no-cache")
|
||||
c.Header("Content-Type", "text/html")
|
||||
c.Header("Content-Length", strconv.Itoa(buf.Len()))
|
||||
c.Writer.Write(buf.Bytes())
|
||||
if _, err := c.Writer.Write(buf.Bytes()); err != nil {
|
||||
AbortWithProblemDetail(c, ProblemError(err))
|
||||
return
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -1,15 +1,17 @@
|
||||
package server
|
||||
|
||||
import (
|
||||
"context"
|
||||
"log/slog"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
sloggin "github.com/samber/slog-gin"
|
||||
"log/slog"
|
||||
)
|
||||
|
||||
// StructuredLogger logs a gin HTTP request in JSON format. Allows to set the
|
||||
// logger for testing purposes.
|
||||
func StructuredLogger(logger *slog.Logger) gin.HandlerFunc {
|
||||
if logger.Enabled(nil, slog.LevelDebug) {
|
||||
if logger.Enabled(context.TODO(), slog.LevelDebug) {
|
||||
return sloggin.NewWithConfig(logger, sloggin.Config{
|
||||
DefaultLevel: slog.LevelInfo,
|
||||
ClientErrorLevel: slog.LevelWarn,
|
||||
|
||||
@@ -4,12 +4,13 @@ import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/sablierapp/sablier/internal/api"
|
||||
"github.com/sablierapp/sablier/pkg/config"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/sablierapp/sablier/internal/api"
|
||||
"github.com/sablierapp/sablier/pkg/config"
|
||||
)
|
||||
|
||||
func setupRouter(ctx context.Context, logger *slog.Logger, serverConf config.Server, s *api.ServeStrategy) *gin.Engine {
|
||||
@@ -34,8 +35,7 @@ func Start(ctx context.Context, logger *slog.Logger, serverConf config.Server, s
|
||||
|
||||
r := setupRouter(ctx, logger, serverConf, s)
|
||||
|
||||
var server *http.Server
|
||||
server = &http.Server{
|
||||
server := &http.Server{
|
||||
Addr: fmt.Sprintf(":%d", serverConf.Port),
|
||||
Handler: r,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user