Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3c8c83caa8 | |||
| 4abd40d8e2 | |||
| 9121da9aae | |||
| 74ce052b77 | |||
| 1eef38a5fa | |||
| 97a82e9b2c | |||
|
|
869b7ca4c3 |
12
.gitea/workflows/check.yml
Normal file
12
.gitea/workflows/check.yml
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
name: check
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
pull_request:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
check:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
||||||
|
- run: docker build .
|
||||||
53
Dockerfile
53
Dockerfile
@@ -1,39 +1,20 @@
|
|||||||
# First stage: Use the golangci-lint image to run the linter
|
# Lint stage: format check + golangci-lint
|
||||||
FROM golangci/golangci-lint:latest as lint
|
# golangci-lint v1.64.8 (2025-02-18)
|
||||||
|
FROM golangci/golangci-lint@sha256:2987913e27f4eca9c8a39129d2c7bc1e74fbcf77f181e01cea607be437aa5cb8 AS lint
|
||||||
# Set the Current Working Directory inside the container
|
WORKDIR /src
|
||||||
WORKDIR /app
|
COPY go.mod go.sum ./
|
||||||
|
RUN go mod download
|
||||||
# Copy the go.mod file and the rest of the application code
|
|
||||||
COPY go.mod ./
|
|
||||||
COPY . .
|
COPY . .
|
||||||
|
RUN make fmt-check
|
||||||
|
RUN make lint
|
||||||
|
|
||||||
# Run golangci-lint
|
# Test stage: run full test suite
|
||||||
RUN golangci-lint run
|
# golang 1.22.12 (2025-02-04)
|
||||||
|
FROM golang@sha256:1cf6c45ba39db9fd6db16922041d074a63c935556a05c5ccb62d181034df7f02 AS test
|
||||||
RUN sh -c 'test -z "$(gofmt -l .)"'
|
# Depend on lint stage so both stages always run
|
||||||
|
COPY --from=lint /src/go.sum /dev/null
|
||||||
# Second stage: Use the official Golang image to run tests
|
WORKDIR /src
|
||||||
FROM golang:1.22 as test
|
COPY go.mod go.sum ./
|
||||||
|
RUN go mod download
|
||||||
# Set the Current Working Directory inside the container
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Copy the go.mod file and the rest of the application code
|
|
||||||
COPY go.mod ./
|
|
||||||
COPY . .
|
COPY . .
|
||||||
|
RUN make test
|
||||||
# Run tests
|
|
||||||
RUN go test -v ./...
|
|
||||||
|
|
||||||
# Final stage: Combine the linting and testing stages
|
|
||||||
FROM golang:1.22 as final
|
|
||||||
|
|
||||||
# Ensure that the linting stage succeeded
|
|
||||||
WORKDIR /app
|
|
||||||
COPY --from=lint /app .
|
|
||||||
COPY --from=test /app .
|
|
||||||
|
|
||||||
# Set the final CMD to something minimal since we only needed to verify lint and tests during build
|
|
||||||
CMD ["echo", "Build and tests passed successfully!"]
|
|
||||||
|
|
||||||
|
|||||||
17
Makefile
17
Makefile
@@ -1,6 +1,6 @@
|
|||||||
.PHONY: test
|
.PHONY: test fmt fmt-check lint check docker hooks
|
||||||
|
|
||||||
default: test
|
default: check
|
||||||
|
|
||||||
test:
|
test:
|
||||||
@go test -v ./...
|
@go test -v ./...
|
||||||
@@ -9,9 +9,20 @@ fmt:
|
|||||||
goimports -l -w .
|
goimports -l -w .
|
||||||
golangci-lint run --fix
|
golangci-lint run --fix
|
||||||
|
|
||||||
|
fmt-check:
|
||||||
|
@test -z "$$(gofmt -l .)" || { echo "gofmt would reformat:"; gofmt -l .; exit 1; }
|
||||||
|
|
||||||
lint:
|
lint:
|
||||||
golangci-lint run
|
golangci-lint run
|
||||||
sh -c 'test -z "$$(gofmt -l .)"'
|
|
||||||
|
check: fmt-check lint test
|
||||||
|
|
||||||
docker:
|
docker:
|
||||||
docker build --progress plain .
|
docker build --progress plain .
|
||||||
|
|
||||||
|
hooks:
|
||||||
|
@echo "Installing git hooks..."
|
||||||
|
@mkdir -p .git/hooks
|
||||||
|
@printf '#!/bin/sh\nmake check\n' > .git/hooks/pre-commit
|
||||||
|
@chmod +x .git/hooks/pre-commit
|
||||||
|
@echo "Pre-commit hook installed."
|
||||||
|
|||||||
@@ -63,3 +63,4 @@ func main() {
|
|||||||
## License
|
## License
|
||||||
|
|
||||||
[WTFPL](./LICENSE)
|
[WTFPL](./LICENSE)
|
||||||
|
|
||||||
|
|||||||
@@ -3,8 +3,9 @@ package simplelog
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"log"
|
"fmt"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
|
"os"
|
||||||
)
|
)
|
||||||
|
|
||||||
type JSONHandler struct{}
|
type JSONHandler struct{}
|
||||||
@@ -15,7 +16,7 @@ func NewJSONHandler() *JSONHandler {
|
|||||||
|
|
||||||
func (j *JSONHandler) Handle(ctx context.Context, record slog.Record) error {
|
func (j *JSONHandler) Handle(ctx context.Context, record slog.Record) error {
|
||||||
jsonData, _ := json.Marshal(record)
|
jsonData, _ := json.Marshal(record)
|
||||||
log.Println(string(jsonData))
|
fmt.Fprintln(os.Stdout, string(jsonData))
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
33
json_handler_test.go
Normal file
33
json_handler_test.go
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
package simplelog
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log/slog"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TestJSONHandlerDeadlock verifies that JSONHandler.Handle does not deadlock
|
||||||
|
// when the default slog handler routes log.Println back through slog.
|
||||||
|
// On the unfixed code this test will hang (deadlock); with the fix it completes.
|
||||||
|
func TestJSONHandlerDeadlock(t *testing.T) {
|
||||||
|
handler := NewJSONHandler()
|
||||||
|
|
||||||
|
// Set our handler as the default so log.Println routes through slog
|
||||||
|
logger := slog.New(handler)
|
||||||
|
slog.SetDefault(logger)
|
||||||
|
|
||||||
|
done := make(chan struct{})
|
||||||
|
go func() {
|
||||||
|
// This call deadlocks on unfixed code because Handle() calls
|
||||||
|
// log.Println() which re-enters slog → Handle() → log.Println() …
|
||||||
|
slog.Info("test message")
|
||||||
|
close(done)
|
||||||
|
}()
|
||||||
|
|
||||||
|
select {
|
||||||
|
case <-done:
|
||||||
|
// success
|
||||||
|
case <-time.After(5 * time.Second):
|
||||||
|
t.Fatal("JSONHandler.Handle deadlocked: timed out after 5 seconds")
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user