Merge remote-tracking branch 'origin/unstable' into unstable

[redis.git] / utils / redis.conf.tpl

diff --git a/utils/redis.conf.tpl b/utils/redis.conf.tpl
index 0c1a07ea61daf36faede9f488dcee7271319d17a..9e2e13557124292593bae7a84a4a4ae6e951d62e 100644 (file)
--- a/utils/redis.conf.tpl
+++ b/utils/redis.conf.tpl
@@ -14,11 +14,11 @@
 
 # By default Redis does not run as a daemon. Use 'yes' if you need it.
 # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
 
 # By default Redis does not run as a daemon. Use 'yes' if you need it.
 # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.

-daemonize no
+daemonize yes

 
 # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
 # default. You can specify a custom pid file location here.
 
 # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
 # default. You can specify a custom pid file location here.

-pidfile /var/run/redis.pid
+pidfile $PIDFILE

 
 # Accept connections on the specified port, default is 6379.
 # If port 0 is specified Redis will not listen on a TCP socket.
 
 # Accept connections on the specified port, default is 6379.
 # If port 0 is specified Redis will not listen on a TCP socket.


@@ -317,7 +317,7 @@ auto-aof-rewrite-min-size 64mb
 # Max execution time of a Lua script in milliseconds.
 # This prevents that a programming error generating an infinite loop will block
 # your server forever. Set it to 0 or a negative value for unlimited execution.
 # Max execution time of a Lua script in milliseconds.
 # This prevents that a programming error generating an infinite loop will block
 # your server forever. Set it to 0 or a negative value for unlimited execution.

-lua-time-limit 60000
+#lua-time-limit 60000

 
 ################################## SLOW LOG ###################################
 
 
 ################################## SLOW LOG ###################################