diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py
index dce8d3c96..0c4f1cc25 100644
--- a/apps/rss_feeds/models.py
+++ b/apps/rss_feeds/models.py
@@ -1977,7 +1977,7 @@ class MStarredStory(mongo.Document):
return stories
@classmethod
- def trim_old_stories(cls, stories=10, days=30, dryrun=False):
+ def trim_old_stories(cls, stories=10, days=60, dryrun=False):
print " ---> Fetching starred story counts..."
stats = settings.MONGODB.newsblur.starred_stories.aggregate([{
"$group": {
diff --git a/clients/ios/Entitlements.entitlements b/clients/ios/Entitlements.entitlements
index fe238e5c4..c468210c7 100644
--- a/clients/ios/Entitlements.entitlements
+++ b/clients/ios/Entitlements.entitlements
@@ -5,7 +5,7 @@
application-identifier
$(AppIdentifierPrefix)$(CFBundleIdentifier)
get-task-allow
-
+
keychain-access-groups
$(AppIdentifierPrefix)$(CFBundleIdentifier)
diff --git a/config/monit_debug.sh b/config/monit_debug.sh
new file mode 100644
index 000000000..55c9d7904
--- /dev/null
+++ b/config/monit_debug.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+ {
+ echo "MONIT-WRAPPER date"
+ date
+ echo "MONIT-WRAPPER env"
+ env
+ echo "MONIT-WRAPPER $@"
+ $@
+ R=$?
+ echo "MONIT-WRAPPER exit code $R"
+ } 2>&1 | logger
\ No newline at end of file
diff --git a/config/monit_redis.conf b/config/monit_redis.conf
index 55a92b095..137629609 100644
--- a/config/monit_redis.conf
+++ b/config/monit_redis.conf
@@ -1,10 +1,10 @@
set daemon 30
-
+
set logfile /var/log/monit.log
check process redis with pidfile /var/run/redis.pid
- stop program = "/etc/init.d/redis stop"
+ stop program = "/etc/monit/monit_debug.sh /etc/init.d/redis stop"
as uid root and gid root
- start program = "/etc/init.d/redis start"
+ start program = "/etc/monit/monit_debug.sh /etc/init.d/redis start"
as uid root and gid root
- if failed host 127.0.0.1 port 6379 then restart
+ # if failed host 127.0.0.1 port 6379 then restart
diff --git a/fabfile.py b/fabfile.py
index 90656a0b4..6862b81e9 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -477,6 +477,10 @@ def config_monit_app():
sudo('/etc/init.d/monit restart')
def config_monit_redis():
+ sudo('chown root.root /etc/init.d/redis')
+ sudo('chmod a+x /etc/init.d/redis')
+ put('config/monit_debug.sh', '/etc/monit/monit_debug.sh', use_sudo=True)
+ sudo('chmod a+x /etc/monit/monit_debug.sh')
put('config/monit_redis.conf', '/etc/monit/conf.d/redis.conf', use_sudo=True)
sudo('echo "START=yes" > /etc/default/monit')
sudo('/etc/init.d/monit restart')
@@ -863,7 +867,7 @@ def setup_mongo_mms():
def setup_redis(slave=False):
- redis_version = '2.6.14'
+ redis_version = '2.6.16'
with cd(env.VENDOR_PATH):
run('wget http://redis.googlecode.com/files/redis-%s.tar.gz' % redis_version)
run('tar -xzf redis-%s.tar.gz' % redis_version)
@@ -887,6 +891,7 @@ def setup_redis(slave=False):
sudo('/etc/init.d/redis stop')
sudo('/etc/init.d/redis start')
setup_syncookies()
+ config_monit_redis()
def setup_munin():
# sudo('apt-get update')