Skip to content

Commit 34092da

Browse files
committed
Merge remote-tracking branch 'origin/staging' into sprint-1.14
# Conflicts: # docker.local/base.Dockerfile
2 parents e0fb576 + 149e35b commit 34092da

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

code/go/0chain.net/blobbercore/challenge/protocol.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ func (cr *ChallengeEntity) LoadValidationTickets(ctx context.Context) error {
223223
allocMu.RUnlock()
224224

225225
postDataBytes, err := json.Marshal(postData)
226+
logging.Logger.Info("[challenge]post: ", zap.Any("challenge_id", cr.ChallengeID), zap.Any("post_data_len", len(postData)/(1024*1024)))
226227
if err != nil {
227228
logging.Logger.Error("[db]form: " + err.Error())
228229
cr.CancelChallenge(ctx, err)

code/go/0chain.net/core/util/http.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func NewHTTPRequest(method, url string, data []byte) (*http.Request, context.Con
2727
req.Header.Set("X-App-Client-ID", node.Self.ID)
2828
req.Header.Set("X-App-Client-Key", node.Self.PublicKey)
2929
req.Header.Set("X-App-Request-Hash", requestHash)
30-
ctx, cncl := context.WithTimeout(context.Background(), time.Second*10)
30+
ctx, cncl := context.WithTimeout(context.Background(), time.Second*60)
3131
return req, ctx, cncl, err
3232
}
3333

docker.local/base.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ WORKDIR /tmp
99

1010
RUN apk upgrade
1111
RUN apk del libstdc++ gmp-dev openssl-dev vips-dev
12-
RUN apk add --update --no-cache libstdc++ gmp-dev openssl-dev vips-dev
12+
RUN apk add --update --no-cache libstdc++ gmp-dev openssl-dev vips-dev

0 commit comments

Comments
 (0)