Skip to content
Open
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
2 changes: 1 addition & 1 deletion Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
ARG GO_VERSION=1.22.2
FROM pscale.dev/wolfi-prod/go:${GO_VERSION} AS build

RUN apk add --no-cache libxcrypt ruby-3.2 ruby3.2-bundler && \
RUN apk add --no-cache libxcrypt ruby-3.2 ruby-3.2-dev ruby3.2-bundler && \
gem install license_finder

ENTRYPOINT []
Expand Down
6 changes: 3 additions & 3 deletions cmd/internal/planetscale_edge_database.go
Original file line number Diff line number Diff line change
Expand Up @@ -208,16 +208,16 @@ func (p PlanetScaleEdgeDatabase) Read(ctx context.Context, w io.Writer, ps Plane
if s, ok := status.FromError(err); ok {
// if the error is anything other than server timeout, keep going
if s.Code() != codes.DeadlineExceeded {
p.Logger.Log(LOGLEVEL_INFO, fmt.Sprintf("%v Got error [%v], Returning with cursor :[%v] after server timeout", preamble, s.Code(), currentPosition))
p.Logger.Log(LOGLEVEL_ERROR, fmt.Sprintf("%v Got error [%v], Returning with cursor :[%v] after server timeout", preamble, s.Code(), currentPosition))
return currentSerializedCursor, nil
} else {
p.Logger.Log(LOGLEVEL_INFO, preamble+"Continuing with cursor after server timeout")
p.Logger.Log(LOGLEVEL_WARN, preamble+"Continuing with cursor after server timeout")
}
} else if errors.Is(err, io.EOF) {
p.Logger.Log(LOGLEVEL_INFO, fmt.Sprintf("%vFinished reading all rows for table [%v]", preamble, table.Name))
return currentSerializedCursor, nil
} else {
p.Logger.Log(LOGLEVEL_INFO, fmt.Sprintf("non-grpc error [%v]]", err))
p.Logger.Log(LOGLEVEL_ERROR, fmt.Sprintf("non-grpc error [%v]]", err))
return currentSerializedCursor, err
}
}
Expand Down