commit 96d7dca1a7f62b67e09d11567103f7185126e01a
Author: Faye Duxovni <duxovni@duxovni.org>
Date: Mon Apr 03 17:27:00 2023 +0000
Don't treat nil as an unknown type of error (zulip) (#2024)
Fixes #1869
diff --git a/bridge/zulip/zulip.go b/bridge/zulip/zulip.go
index c912b6f..9b8b73c 100644
--- a/bridge/zulip/zulip.go
+++ b/bridge/zulip/zulip.go
@@ -10630 +10631 @@ func (b *Bzulip) getChannel(id int) string {
func (b *Bzulip) handleQueue() error {
for {
messages, err := b.q.GetEvents()
- switch err {
- case gzb.BackoffError:
- time.Sleep(time.Second * 5)
- case gzb.NoJSONError:
- b.Log.Error("Response wasn't JSON, server down or restarting? sleeping 10 seconds")
- time.Sleep(time.Second * 10)
- case gzb.BadEventQueueError:
- b.Log.Info("got a bad event queue id error, reconnecting")
- b.bot.Queues = nil
- for {
- b.q, err = b.bot.RegisterAll()
- if err != nil {
- b.Log.Errorf("reconnecting failed: %s. Sleeping 10 seconds", err)
- time.Sleep(time.Second * 10)
+ if err != nil {
+ switch err {
+ case gzb.BackoffError:
+ time.Sleep(time.Second * 5)
+ case gzb.NoJSONError:
+ b.Log.Error("Response wasn't JSON, server down or restarting? sleeping 10 seconds")
+ time.Sleep(time.Second * 10)
+ case gzb.BadEventQueueError:
+ b.Log.Info("got a bad event queue id error, reconnecting")
+ b.bot.Queues = nil
+ for {
+ b.q, err = b.bot.RegisterAll()
+ if err != nil {
+ b.Log.Errorf("reconnecting failed: %s. Sleeping 10 seconds", err)
+ time.Sleep(time.Second * 10)
+ }
+ break
}
- break
+ case gzb.HeartbeatError:
+ b.Log.Debug("heartbeat received.")
+ default:
+ b.Log.Debugf("receiving error: %#v", err)
+ time.Sleep(time.Second * 10)
}
- case gzb.HeartbeatError:
- b.Log.Debug("heartbeat received.")
- default:
- b.Log.Debugf("receiving error: %#v", err)
- time.Sleep(time.Second * 10)
- }
- if err != nil {
+
continue
}
for _, m := range messages {
