aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Fifield <david@bamsoftware.com>2023-03-21 15:48:53 -0600
committerDavid Fifield <david@bamsoftware.com>2023-04-03 00:18:26 -0600
commit6bdd48c006a5c107dae7ba8330bbf1f9eda77059 (patch)
treecb58a9143a9340daa4da34e50d50a97a17fbf7d2
parent17829d80d5b20d3c439326ea5028db6ebfa2d2cc (diff)
downloadsnowflake-6bdd48c006a5c107dae7ba8330bbf1f9eda77059.tar.gz
snowflake-6bdd48c006a5c107dae7ba8330bbf1f9eda77059.zip
Restore ListenAndServe error return in Transport.Listen.
This error return was lost in 11f0846264d4033e7a7dc7824febb6ad7140762f; i.e. !31. Fixes #40043.
-rw-r--r--server/lib/snowflake.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/server/lib/snowflake.go b/server/lib/snowflake.go
index 4078358..c4d3fbc 100644
--- a/server/lib/snowflake.go
+++ b/server/lib/snowflake.go
@@ -125,13 +125,15 @@ func (t *Transport) Listen(addr net.Addr, numKCPInstances int) (*SnowflakeListen
errChan <- err
}
}()
-
select {
case err = <-errChan:
break
case <-time.After(listenAndServeErrorTimeout):
break
}
+ if err != nil {
+ return nil, err
+ }
listener.server = server