Updating fabfile with redis config needed.

apps/reader/models.py

@@ -550,7 +550,7 @@ class UserSubscription(models.Model):
         # r.sunionstore("%s:backup" % key, key)
         # r.expire("%s:backup" % key, 60*60*24)
         r.sunionstore(key, *["%s:%s" % (key, f) for f in feeds])
-        new_rs = r.smembers(key)        
+        new_rs = r.smembers(key)
         
         missing_rs = []
         missing_count = 0

config/redis.conf

@@ -473,7 +473,7 @@ lua-time-limit 1000
 # The following time is expressed in microseconds, so 1000000 is equivalent
 # to one second. Note that a negative number disables the slow log, while
 # a value of zero forces the logging of every command.
-slowlog-log-slower-than 100000
+slowlog-log-slower-than 1000000
 
 # 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.

fabfile.py

@@ -267,6 +267,7 @@ def setup_db(engine=None, skip_common=False):
         setup_db_search()
     setup_gunicorn(supervisor=False)
     setup_db_munin()
+    setup_db_monitor()
     setup_usage_monitor()
     done()
 
@@ -434,7 +435,7 @@ def setup_python():
     #     sudo('python setup.py install')
 
     with settings(warn_only=True):
-        sudo('echo "import sys; sys.setdefaultencoding(\"utf-8\")" | sudo tee /usr/lib/python2.7/sitecustomize.py')
+        sudo('echo "import sys; sys.setdefaultencoding(\'utf-8\')" | sudo tee /usr/lib/python2.7/sitecustomize.py')
         sudo("chmod a+r /usr/local/lib/python2.7/dist-packages/httplib2-0.8-py2.7.egg/EGG-INFO/top_level.txt")
         sudo("chmod a+r /usr/local/lib/python2.7/dist-packages/python_dateutil-2.1-py2.7.egg/EGG-INFO/top_level.txt")
         sudo("chmod a+r /usr/local/lib/python2.7/dist-packages/httplib2-0.8-py2.7.egg/httplib2/cacerts.txt")
@@ -974,6 +975,7 @@ def setup_redis(slave=False):
     sudo("chown root.root /etc/rc.local")
     sudo("chmod a+x /etc/rc.local")
     sudo('echo "never" | sudo tee /sys/kernel/mm/transparent_hugepage/enabled')
+    run('echo "\nnet.core.somaxconn=65535\n" | sudo tee -a /etc/sysctl.conf', pty=False)
     sudo('mkdir -p /var/lib/redis')
     sudo('update-rc.d redis defaults')
     sudo('/etc/init.d/redis stop')

templates/maintenance_off.html

@@ -85,7 +85,7 @@
                         <img src="/media/img/logo_512.png" class="logo">
                         <h1>NewsBlur is in <span class="error404">maintenance mode</span></h1>
                         <div class="description">
-                            <p>The new postgres database server has been humming smoothly all day, but now a redis database server fell off the face of the earth. I'm working on getting it back online.</p>
+                            <p>Fixing the last database server that's been giving us grief this past week. This should take just under a minute.</p>
                             <p>To pass the time, <a href="http://mlkshk.com/popular">check out what's popular on MLKSHK</a>.</p>
                         </div>
                     </div>