X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/e7546c639301968a011265b96ea6e7f22407960e..2316bb3b428d583b88a03ad45b955d618bd320cd:/redis.conf

diff --git a/redis.conf b/redis.conf
index 69663521..8b8f34a7 100644
--- a/redis.conf
+++ b/redis.conf
@@ -22,9 +22,10 @@ timeout 300
 # Set server verbosity to 'debug'
 # it can be one of:
 # debug (a lot of information, useful for development/testing)
+# verbose (many rarely useful info, but not a mess like the debug level)
 # notice (moderately verbose, what you want in production probably)
 # warning (only very important / critical messages are logged)
-loglevel debug
+loglevel verbose
 
 # Specify the log file name. Also 'stdout' can be used to force
 # the demon to log on the standard output. Note that if you use standard
@@ -52,9 +53,9 @@ databases 16
 #
 #   Note: you can disable saving at all commenting all the "save" lines.
 
-#save 900 1
-#save 300 10
-#save 60 10000
+save 900 1
+save 300 10
+save 60 10000
 
 # Compress string objects using LZF when dump .rdb databases?
 # For default that's set to 'yes' as it's almost always a win.
@@ -100,7 +101,7 @@ dir ./
 
 # Set the max number of connected clients at the same time. By default there
 # is no limit, and it's up to the number of file descriptors the Redis process
-# is able to open. The special value '0' means no limts.
+# is able to open. The special value '0' means no limits.
 # Once the limit is reached Redis will close all the new connections sending
 # an error 'max number of clients reached'.
 #
@@ -178,12 +179,30 @@ appendfsync always
 # To enable VM just set 'vm-enabled' to yes, and set the following three
 # VM parameters accordingly to your needs.
 
-vm-enabled yes
-# vm-enabled no
+vm-enabled no
+# vm-enabled yes
+
+# This is the path of the Redis swap file. As you can guess, swap files
+# can't be shared by different Redis instances, so make sure to use a swap
+# file for every redis process you are running.
+#
+# The swap file name may contain "%p" that is substituted with the PID of
+# the Redis process, so the default name /tmp/redis-%p.vm will work even
+# with multiple instances as Redis will use, for example, redis-811.vm
+# for one instance and redis-593.vm for another one.
+#
+# Useless to say, the best kind of disk for a Redis swap file (that's accessed
+# at random) is a Solid State Disk (SSD).
+vm-swap-file /tmp/redis-%p.vm
 
 # vm-max-memory configures the VM to use at max the specified amount of
 # RAM. Everything that deos not fit will be swapped on disk *if* possible, that
 # is, if there is still enough contiguous space in the swap file.
+#
+# With vm-max-memory 10000000 the system will swap almost everything it
+# can. Not a good default, just specify the max amount of RAM you can
+# in bytes, but it's better to leave some margin. For instance specify
+# an amount of RAM that's more or less 80% of your free RAM.
 vm-max-memory 10000000
 
 # Redis swap files is split into pages. An object can be saved using multiple
@@ -194,7 +213,7 @@ vm-max-memory 10000000
 #
 # If you use a lot of small objects, use a page size of 64 or 32 bytes.
 # If you use a lot of big objects, use a bigger page size.
-# If unsure, use the defualt :)
+# If unsure, use the default :)
 vm-page-size 256
 
 # Number of total memory pages in the swap file.
@@ -204,9 +223,23 @@ vm-page-size 256
 # The total swap size is vm-page-size * vm-pages
 #
 # With the default of 256-bytes memory pages and 104857600 pages Redis will
-# use a 25 GB swap file, that will use rougly 13 MB of RAM for the page table.
+# use a 25 GB swap file, that will use roughly 13 MB of RAM for the page table.
+#
+# It's better to use the smallest acceptable value for your application,
+# but the default is large in order to work in most conditions.
 vm-pages 104857600
 
+# Max number of VM I/O threads running at the same time.
+# This threads are used to read/write data from/to swap file, since they
+# also encode and decode objects from disk to memory or the reverse, a bigger
+# number of threads can help with big objects even if they can't help with
+# I/O itself as the physical device may not be able to couple with many
+# reads/writes operations at the same time.
+#
+# The special value of 0 turn off threaded I/O and enables the blocking
+# Virtual Memory implementation.
+vm-max-threads 4
+
 ############################### ADVANCED CONFIG ###############################
 
 # Glue small output buffers together in order to send small replies in a