Skip to content

Commit 10e2539

Browse files
committed
[protocol] reconnecting ws: 1sec timeout
1 parent 92ccb0d commit 10e2539

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
@@ -124,6 +124,8 @@ func (rc *ReconnectingWebsocket) Dial() {
124124
case err := <-rc.errCh:
125125
log.WithError(err).WithField("url", rc.url).Warn("connection has been closed, reconnecting...")
126126
conn.Close()
127+
128+
time.Sleep(1 * time.Second)
127129
conn = rc.connect()
128130
}
129131
}

test/pkg/integration/apis.go

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

0 commit comments

Comments
 (0)