Skip to content

Commit

Permalink
added loose fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
otherview committed Sep 22, 2023
1 parent f752a93 commit d55431a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/manual-deploy-obscuro-gateway-database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion integration/manualtests/connection_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions tools/walletextension/userconn/user_conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit d55431a

Please sign in to comment.