Browse files

Allow timeout=0 config to disable client timeouts

  • Loading branch information...
1 parent 83cdfe1 commit 0150db364d939a5a69244aca6a66ad05903979fe @tmm1 tmm1 committed May 19, 2009
Showing with 3 additions and 3 deletions.
  1. +2 −2 redis.c
  2. +1 −1 redis.conf
View
4 redis.c
@@ -720,7 +720,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
}
/* Close connections of timedout clients */
- if (!(loops % 10))
+ if (server.maxidletime && !(loops % 10))
closeTimedoutClients();
/* Check if a background saving in progress terminated */
@@ -959,7 +959,7 @@ static void loadServerConfig(char *filename) {
/* Execute config directives */
if (!strcasecmp(argv[0],"timeout") && argc == 2) {
server.maxidletime = atoi(argv[1]);
- if (server.maxidletime < 1) {
+ if (server.maxidletime < 0) {
err = "Invalid timeout value"; goto loaderr;
}
} else if (!strcasecmp(argv[0],"port") && argc == 2) {
View
2 redis.conf
@@ -16,7 +16,7 @@ port 6379
#
# bind 127.0.0.1
-# Close the connection after a client is idle for N seconds
+# Close the connection after a client is idle for N seconds (0 to disable)
timeout 300
# Save the DB on disk:

0 comments on commit 0150db3

Please sign in to comment.