Fix overflow in mstime() in redis-cli and benchmark.

[redis.git] / redis.conf

diff --git a/redis.conf b/redis.conf
index bcad01e003f0217213d9449c57638a5b69957052..97aea334b4eb759b9aee49826a200ff5530de971 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -196,6 +196,21 @@ slave-read-only yes
 #
 # repl-timeout 60
 
+# The slave priority is an integer number published by Redis in the INFO output.
+# It is used by Redis Sentinel in order to select a slave to promote into a
+# master if the master is no longer working correctly.
+#
+# A slave with a low priority number is considered better for promotion, so
+# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
+# pick the one wtih priority 10, that is the lowest.
+#
+# However a special priority of 0 marks the slave as not able to perform the
+# role of master, so a slave with priority of 0 will never be selected by
+# Redis Sentinel for promotion.
+#
+# By default the priority is 100.
+slave-priority 100
+
 ################################## SECURITY ###################################
 
 # Require clients to issue AUTH <PASSWORD> before processing any other
@@ -428,7 +443,7 @@ slowlog-log-slower-than 10000
 
 # There is no limit to this length. Just be aware that it will consume memory.
 # You can reclaim memory used by the slow log with SLOWLOG RESET.
-slowlog-max-len 1024
+slowlog-max-len 128
 
 ############################### ADVANCED CONFIG ###############################