From d55431a942117dfb2d7941dffedfd51e128966ad Mon Sep 17 00:00:00 2001 From: otherview Date: Fri, 22 Sep 2023 18:13:37 +0100 Subject: [PATCH] added loose fixes --- .github/workflows/manual-deploy-obscuro-gateway-database.yml | 4 +++- integration/manualtests/connection_test.go | 2 +- tools/walletextension/userconn/user_conn.go | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/manual-deploy-obscuro-gateway-database.yml b/.github/workflows/manual-deploy-obscuro-gateway-database.yml index a2c7b566bb..8ab3b8ebaa 100644 --- a/.github/workflows/manual-deploy-obscuro-gateway-database.yml +++ b/.github/workflows/manual-deploy-obscuro-gateway-database.yml @@ -117,4 +117,6 @@ jobs: -e MARIADB_USER=obscurouser \ -e MARIADB_PASSWORD=${{ secrets.OBSCURO_GATEWAY_MARIADB_USER_PWD }} \ -v /home/obscuro/go-obscuro/tools/walletextension/storage/database/001_init.sql:/docker-entrypoint-initdb.d/schema.sql \ - mariadb:11.1.2-jammy' + mariadb:11.1.2-jammy \ + --max_password_errors=2' + diff --git a/integration/manualtests/connection_test.go b/integration/manualtests/connection_test.go index 987d144b48..d7ba3d5f6a 100644 --- a/integration/manualtests/connection_test.go +++ b/integration/manualtests/connection_test.go @@ -27,7 +27,7 @@ func TestSubscribeToOG(t *testing.T) { // Using http ogHTTPAddress := "https://dev-testnet.obscu.ro:443" ogWSAddress := "wss://dev-testnet.obscu.ro:81" - //ogWSAddress := "ws://51.132.131.47:81" + // ogWSAddress := "ws://51.132.131.47:81" // join the network statusCode, userID, err := fasthttp.Get(nil, fmt.Sprintf("%s/v1/join/", ogHTTPAddress)) diff --git a/tools/walletextension/userconn/user_conn.go b/tools/walletextension/userconn/user_conn.go index c8b228fdd5..e2d2790883 100644 --- a/tools/walletextension/userconn/user_conn.go +++ b/tools/walletextension/userconn/user_conn.go @@ -91,7 +91,7 @@ func (h *userConnHTTP) WriteResponse(msg []byte) error { } func (h *userConnHTTP) HandleError(msg string) { - h.logger.Error(msg) + h.logger.Error(fmt.Sprintf("Handling HTTP user error - %s", msg)) httpLogAndSendErr(h.resp, msg) } @@ -139,7 +139,7 @@ func (w *userConnWS) WriteResponse(msg []byte) error { // HandleError logs and prints the error, and writes it to the websocket as a JSON object with a single key, "error". func (w *userConnWS) HandleError(msg string) { - w.logger.Error("error in user WS connection - " + msg) + w.logger.Error(fmt.Sprintf("Handling WS user error - %s", msg)) errMsg, err := json.Marshal(map[string]interface{}{ common.JSONKeyErr: msg,