From: Joseph Snow <josephsnow@gmail.com>
Date: Tue, 15 Nov 2011 23:16:23 +0000 (-0700)
Subject: Merge branch 'master' of github.com:finalsclubdev/FinalsClub
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9762b68f5dce4b936d89d03b7ce3c0a64198e80d;p=oweals%2Ffinalsclub.git

Merge branch 'master' of github.com:finalsclubdev/FinalsClub
---

9762b68f5dce4b936d89d03b7ce3c0a64198e80d
diff --cc util/crontab-example.txt
index 493b781,493b781..f0b87f9
--- a/util/crontab-example.txt
+++ b/util/crontab-example.txt
@@@ -10,7 -10,7 +10,7 @@@
  
  ## added by jsnow on 11/9/2011
  ## this script checks if EPL is up and running. if not, it sends an alert email
--5,20,35,50 * * * * /home/ec2-user/fc/util/fc_monitor_epl_cron.sh > /home/ec2-user/fc/util/fc_monitor_epl_cron.log.txt
++#### 5,20,35,50 * * * * /home/ec2-user/fc/util/fc_monitor_epl_cron.sh > /home/ec2-user/fc/util/fc_monitor_epl_cron.log.txt
  
  ## added by jsnow on 11/10/2011
  ## this script updates custom disk space stats to AWS cloudwatch. this script should be run every 5 minutes
diff --cc util/reboot-restart.sh
index 459cabc,459cabc..2a424a6
--- a/util/reboot-restart.sh
+++ b/util/reboot-restart.sh
@@@ -12,6 -12,6 +12,13 @@@ rm /data/db/mongod.loc
  
  pushd .
  cd /home/ec2-user/fc
++
++## start the node apps
  ./restart
++
++## run the EPL monitor 
++./util/start-fc-epl-monitor.sh &
++
  popd
  
++