Updated individual launch scripts

bin/launch_logs.sh

@@ -3,6 +3,10 @@
 set -e
 set -x
 
+[ -z "$AIL_HOME" ] && echo "Needs the env var AIL_HOME. Run the script from the virtual environment." && exit 1;
+[ -z "$AIL_REDIS" ] && echo "Needs the env var AIL_REDIS. Run the script from the virtual environment." && exit 1;
+[ -z "$AIL_LEVELDB" ] && echo "Needs the env var AIL_LEVELDB. Run the script from the virtual environment." && exit 1;
+
 screen -dmS "Logging"
 sleep 0.1
 echo -e $GREEN"\t* Launching logging process"$DEFAULT

bin/launch_lvldb.sh

@@ -3,21 +3,27 @@
 set -e
 set -x
 
+[ -z "$AIL_HOME" ] && echo "Needs the env var AIL_HOME. Run the script from the virtual environment." && exit 1;
+[ -z "$AIL_REDIS" ] && echo "Needs the env var AIL_REDIS. Run the script from the virtual environment." && exit 1;
+[ -z "$AIL_LEVELDB" ] && echo "Needs the env var AIL_LEVELDB. Run the script from the virtual environment." && exit 1;
+
 lvdbhost='127.0.0.1'
 lvdbdir="${AIL_HOME}/LEVEL_DB_DATA/"
-db1_y='2013'
-db2_y='2014'
-db3_y='2016'
-db4_y='3016'
 nb_db=13
 
+db_y=`date +%Y`
+#Verify that a dir with the correct year exists, create it otherwise
+if [ ! -d "$lvdbdir$db_y" ]; then
+    mkdir -p "$db_y"
+fi
+
 screen -dmS "LevelDB"
 sleep 0.1
 echo -e $GREEN"\t* Launching Levels DB servers"$DEFAULT
-sleep 0.1
-screen -S "LevelDB" -X screen -t "2016" bash -c 'redis-leveldb -H '$lvdbhost' -D '$lvdbdir'2016/ -P '$db3_y' -M '$nb_db'; read x'
 
-# For Curve
+#Launch a DB for each dir
+for pathDir in $lvdbdir*/ ; do
+    yDir=$(basename "$pathDir")
     sleep 0.1
-screen -S "LevelDB" -X screen -t "3016" bash -c 'redis-leveldb -H '$lvdbhost' -D '$lvdbdir'3016/ -P '$db4_y' -M '$nb_db'; read x'
-
+    screen -S "LevelDB" -X screen -t "$yDir" bash -c 'redis-leveldb -H '$lvdbhost' -D '$pathDir'/ -P '$yDir' -M '$nb_db'; read x'
+done

bin/launch_queues.sh

@@ -3,6 +3,10 @@
 set -e
 set -x
 
+[ -z "$AIL_HOME" ] && echo "Needs the env var AIL_HOME. Run the script from the virtual environment." && exit 1;
+[ -z "$AIL_REDIS" ] && echo "Needs the env var AIL_REDIS. Run the script from the virtual environment." && exit 1;
+[ -z "$AIL_LEVELDB" ] && echo "Needs the env var AIL_LEVELDB. Run the script from the virtual environment." && exit 1;
+
 screen -dmS "Queue"
 sleep 0.1
 

bin/launch_redis.sh

@@ -3,6 +3,10 @@
 set -e
 set -x
 
+[ -z "$AIL_HOME" ] && echo "Needs the env var AIL_HOME. Run the script from the virtual environment." && exit 1;
+[ -z "$AIL_REDIS" ] && echo "Needs the env var AIL_REDIS. Run the script from the virtual environment." && exit 1;
+[ -z "$AIL_LEVELDB" ] && echo "Needs the env var AIL_LEVELDB. Run the script from the virtual environment." && exit 1;
+
 conf_dir="${AIL_HOME}/configs/"
 
 screen -dmS "Redis"

bin/launch_scripts.sh

@@ -3,12 +3,26 @@
 set -e
 set -x
 
+[ -z "$AIL_HOME" ] && echo "Needs the env var AIL_HOME. Run the script from the virtual environment." && exit 1;
+[ -z "$AIL_REDIS" ] && echo "Needs the env var AIL_REDIS. Run the script from the virtual environment." && exit 1;
+[ -z "$AIL_LEVELDB" ] && echo "Needs the env var AIL_LEVELDB. Run the script from the virtual environment." && exit 1;
+
+echo -e "\t* Checking configuration"
+bash -c "./Update-conf.py"
+exitStatus=$?
+if [ $exitStatus -ge 1 ]; then
+    echo -e $RED"\t* Configuration not up-to-date"$DEFAULT
+    exit
+fi
+echo -e $GREEN"\t* Configuration up-to-date"$DEFAULT
+
 screen -dmS "Script"
 sleep 0.1
-
 echo -e $GREEN"\t* Launching ZMQ scripts"$DEFAULT
 
-    screen -S "Script" -X screen -t "ModuleInformation" bash -c './ModuleInformation.py -k 0 -c 1; read x'
+screen -S "Script" -X screen -t "ModuleInformation" bash -c './ModulesInformationV2.py -k 0 -c 1; read x'
+sleep 0.1
+screen -S "Script" -X screen -t "Mixer" bash -c './Mixer.py; read x'
 sleep 0.1
 screen -S "Script" -X screen -t "Global" bash -c './Global.py; read x'
 sleep 0.1
@@ -38,6 +52,10 @@ echo -e $GREEN"\t* Launching ZMQ scripts"$DEFAULT
 sleep 0.1
 screen -S "Script" -X screen -t "CurveManageTopSets" bash -c './CurveManageTopSets.py; read x'
 sleep 0.1
+screen -S "Script" -X screen -t "RegexForTermsFrequency" bash -c './RegexForTermsFrequency.py; read x'
+sleep 0.1
+screen -S "Script" -X screen -t "SetForTermsFrequency" bash -c './SetForTermsFrequency.py; read x'
+sleep 0.1
 screen -S "Script" -X screen -t "Indexer" bash -c './Indexer.py; read x'
 sleep 0.1
 screen -S "Script" -X screen -t "Keys" bash -c './Keys.py; read x'
@@ -54,6 +72,6 @@ echo -e $GREEN"\t* Launching ZMQ scripts"$DEFAULT
 sleep 0.1
 screen -S "Script" -X screen -t "SQLInjectionDetection" bash -c './SQLInjectionDetection.py; read x'
 sleep 0.1
-    screen -S "Script" -X screen -t "Browse_warning_paste" bash -c './Browse_warning_paste.py; read x'
+screen -S "Script" -X screen -t "BrowseWarningPaste" bash -c './BrowseWarningPaste.py; read x'
 sleep 0.1
 screen -S "Script" -X screen -t "SentimentAnalysis" bash -c './SentimentAnalysis.py; read x'