Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tweaks to obs gw #1544

Closed
wants to merge 2 commits into from
Closed
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
3 changes: 2 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,5 @@ 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'
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(msg)
w.logger.Error(fmt.Sprintf("Handling WS user error - %s", msg))

errMsg, err := json.Marshal(map[string]interface{}{
common.JSONKeyErr: msg,
Expand Down