Skip to content

Commit ef4f4b4

Browse files
committed
[protocol] reconnecting ws: 1sec timeout
1 parent d38a0fb commit ef4f4b4

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

components/gitpod-protocol/go/reconnecting-ws.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ func (rc *ReconnectingWebsocket) Dial() {
123123
case err := <-rc.errCh:
124124
log.WithError(err).WithField("url", rc.url).Warn("connection has been closed, reconnecting...")
125125
conn.Close()
126+
127+
time.Sleep(1 * time.Second)
126128
conn = rc.connect()
127129
}
128130
}

test/pkg/integration/apis.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ func (c *ComponentAPI) createGitpodToken(user string) (tkn string, err error) {
213213
row *sql.Row
214214
)
215215
if user == "" {
216-
row = db.QueryRow(`SELECT id FROM d_b_user WHERE NOT id = "` + gitpodBuiltinUserID + `"`)
216+
row = db.QueryRow(`SELECT id FROM d_b_user WHERE NOT id = "` + gitpodBuiltinUserID + `" AND blocked = FALSE AND markedDeleted = FALSE`)
217217
} else {
218218
row = db.QueryRow("SELECT id FROM d_b_user WHERE name = ?", user)
219219
}

0 commit comments

Comments
 (0)