Improved the console command made it resilient to Websocket breaks and redeployment.

This commit is contained in:
Alon Girmonsky 2024-10-10 22:15:00 -07:00
parent b7b0e3dcee
commit ecc577ccc8

View File

@ -42,6 +42,7 @@ func init() {
} }
func runConsole() { func runConsole() {
for {
hubUrl := kubernetes.GetHubUrl() hubUrl := kubernetes.GetHubUrl()
response, err := http.Get(fmt.Sprintf("%s/echo", hubUrl)) response, err := http.Get(fmt.Sprintf("%s/echo", hubUrl))
if err != nil || response.StatusCode != 200 { if err != nil || response.StatusCode != 200 {
@ -64,8 +65,9 @@ func runConsole() {
c, _, err := websocket.DefaultDialer.Dial(u.String(), headers) c, _, err := websocket.DefaultDialer.Dial(u.String(), headers)
if err != nil { if err != nil {
log.Error().Err(err).Send() log.Error().Err(err).Msg("Websocket dial error, retrying in 5 seconds...")
return time.Sleep(5 * time.Second) // Delay before retrying
continue
} }
defer c.Close() defer c.Close()
@ -76,8 +78,8 @@ func runConsole() {
for { for {
_, message, err := c.ReadMessage() _, message, err := c.ReadMessage()
if err != nil { if err != nil {
log.Error().Err(err).Send() log.Error().Err(err).Msg("Error reading websocket message, reconnecting...")
return break // Break to reconnect
} }
msg := string(message) msg := string(message)
@ -93,17 +95,18 @@ func runConsole() {
ticker := time.NewTicker(time.Second) ticker := time.NewTicker(time.Second)
defer ticker.Stop() defer ticker.Stop()
for {
select { select {
case <-done: case <-done:
return log.Warn().Msg(fmt.Sprintf(utils.Yellow, "Connection closed, reconnecting..."))
time.Sleep(5 * time.Second) // Delay before reconnecting
continue // Reconnect after error
case <-interrupt: case <-interrupt:
log.Warn().Msg(fmt.Sprintf(utils.Yellow, "Received interrupt, exiting...")) log.Warn().Msg(fmt.Sprintf(utils.Yellow, "Received interrupt, exiting..."))
err := c.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, "")) err := c.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
if err != nil { if err != nil {
log.Error().Err(err).Send() log.Error().Err(err).Send()
return continue
} }
select { select {