From 5db03c7092de22b01452117c9af589948cce83ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Fri, 4 Aug 2023 16:33:29 +0800 Subject: [PATCH] fix #2347: This mutex is not locked --- cmd/gocq/login.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/cmd/gocq/login.go b/cmd/gocq/login.go index b1e4fcc..80442b9 100644 --- a/cmd/gocq/login.go +++ b/cmd/gocq/login.go @@ -312,8 +312,13 @@ func signSubmit(uin string, cmd string, callbackID int64, buffer []byte, t strin signServer += "/" } buffStr := hex.EncodeToString(buffer) - log.Infof("submit %v: uin=%v, cmd=%v, callbackID=%v, buffer-end=%v", t, uin, cmd, callbackID, - buffStr[len(buffStr)-10:]) + tail := 64 + endl := "..." + if len(buffStr) < tail { + tail = len(buffStr) + endl = "." + } + log.Infof("submit %v: uin=%v, cmd=%v, callbackID=%v, buffer=%v%s", t, uin, cmd, callbackID, buffer[:tail], endl) _, err := download.Request{ Method: http.MethodGet, URL: signServer + "submit" + fmt.Sprintf("?uin=%v&cmd=%v&callback_id=%v&buffer=%v", @@ -334,9 +339,7 @@ func signCallback(uin string, results []gjson.Result, t string) { if err != nil { log.Warnf("callback error: %v", err) } - if len(ret) > 10 { - signSubmit(uin, cmd, callbackID, ret, t) - } + signSubmit(uin, cmd, callbackID, ret, t) } }