Commit Diff
Diff:
eb4f9eac0c35071838c9367f1204db0d0b98ad2e
fb924933765238808feb05fb7178402058026897
fb924933765238808feb05fb7178402058026897
Commit:
fb924933765238808feb05fb7178402058026897
Tree:
08fe134aa1e4d3bbe1f2a64a600a7fd9a050d0c1
Committer:
Alexander Barton <alex@barton.de>
Date:
Mon Oct 29 10:33:49 2012
UTC
Message:
Make server reconnect time a little bit more random
Add randomly up to 15 seconds to the reconnect delay for outgoing server
links when the connection has been "short" and therefore the "ConnectRetry"
delay is being enforced.
This should make it even more unlikely that two servers deadlock each
other when both are trying to connect to the other one at the same time,
for example in test environments.
--- src/ngircd/conf.c
+++ src/ngircd/conf.c
@@ -481,8 +481,12 @@ Conf_UnsetServer( CONN_ID Idx )
* require the next attempt to be delayed. */
Conf_Server[i].lasttry =
t - Conf_ConnectRetry + RECONNECT_DELAY;
- } else
- Conf_Server[i].lasttry = t;
+ } else {
+ /* "Short" connection, enforce "ConnectRetry"
+ * but randomize it a little bit: 15 seconds. */
+ Conf_Server[i].lasttry =
+ t + rand() / (RAND_MAX / 15);
+ }
}
}
}