VM hash type swappability implemented. Handling of failed pthread_create() call.

[redis.git] / redis.conf

diff --git a/redis.conf b/redis.conf
index 1c72bc4aeaf40ad78da06b2bf0176167c391425b..0ed593d2446f0a3222cf7c8bde8a3d3f931db186 100644 (file)
--- a/redis.conf
+++ b/redis.conf
@@ -197,6 +197,10 @@ vm-enabled no
 #
 # Useless to say, the best kind of disk for a Redis swap file (that's accessed
 # at random) is a Solid State Disk (SSD).
+#
+# *** WARNING *** if you are using a shared hosting the default of putting
+# the swap file under /tmp is not secure. Create a dir with access granted
+# only to Redis user and configure Redis to create the swap file there.
 vm-swap-file /tmp/redis-%p.vm
 
 # vm-max-memory configures the VM to use at max the specified amount of
@@ -267,3 +271,10 @@ glueoutputbuf yes
 # your development environment so that we can test it better.
 shareobjects no
 shareobjectspoolsize 1024
+
+# Hashes are encoded in a special way (much more memory efficient) when they
+# have at max a given numer of elements, and the biggest element does not
+# exceed a given threshold. You can configure this limits with the following
+# configuration directives.
+hash-max-zipmap-entries 64
+hash-max-zipmap-value 512