chg: [LAUNCH] update: launch + check BDD

bin/LAUNCH.sh

@@ -64,27 +64,11 @@ function helptext {
 }
 
 function launching_redis {
-    conf_dir="${AIL_HOME}/configs/"
+    bash -c "bash ${AIL_BIN}/launch_redis.sh"
-
-    screen -dmS "Redis_AIL"
-    sleep 0.1
-    echo -e $GREEN"\t* Launching Redis servers"$DEFAULT
-    screen -S "Redis_AIL" -X screen -t "6379" bash -c 'redis-server '$conf_dir'6379.conf ; read x'
-    sleep 0.1
-    screen -S "Redis_AIL" -X screen -t "6380" bash -c 'redis-server '$conf_dir'6380.conf ; read x'
-    sleep 0.1
-    screen -S "Redis_AIL" -X screen -t "6381" bash -c 'redis-server '$conf_dir'6381.conf ; read x'
 }
 
 function launching_ardb {
-    conf_dir="${AIL_HOME}/configs/"
+    bash -c "bash ${AIL_BIN}/launch_ardb.sh"
-
-    screen -dmS "ARDB_AIL"
-    sleep 0.1
-    echo -e $GREEN"\t* Launching ARDB servers"$DEFAULT
-
-    sleep 0.1
-    screen -S "ARDB_AIL" -X screen -t "6382" bash -c 'cd '${AIL_HOME}'; ardb-server '$conf_dir'6382.conf ; read x'
 }
 
 function launching_logs {
@@ -245,36 +229,18 @@ function shutting_down_ardb {
 
 function checking_redis {
     flag_redis=0
-    redis_dir=${AIL_HOME}/redis/src/
+    bash -c "bash ${AIL_BIN}/check_redis.sh"
-    bash -c $redis_dir'redis-cli -p 6379 PING | grep "PONG" &> /dev/null'
     if [ ! $? == 0 ]; then
-       echo -e $RED"\t6379 not ready"$DEFAULT
        flag_redis=1
     fi
-    sleep 0.1
-    bash -c $redis_dir'redis-cli -p 6380 PING | grep "PONG" &> /dev/null'
-    if [ ! $? == 0 ]; then
-       echo -e $RED"\t6380 not ready"$DEFAULT
-       flag_redis=1
-    fi
-    sleep 0.1
-    bash -c $redis_dir'redis-cli -p 6381 PING | grep "PONG" &> /dev/null'
-    if [ ! $? == 0 ]; then
-       echo -e $RED"\t6381 not ready"$DEFAULT
-       flag_redis=1
-    fi
-    sleep 0.1
 
     return $flag_redis;
 }
 
 function checking_ardb {
     flag_ardb=0
-    redis_dir=${AIL_HOME}/redis/src/
+    bash -c "bash ${AIL_BIN}/check_ardb.sh"
-    sleep 0.2
-    bash -c $redis_dir'redis-cli -p 6382 PING | grep "PONG" &> /dev/null'
     if [ ! $? == 0 ]; then
-       echo -e $RED"\t6382 ARDB not ready"$DEFAULT
        flag_ardb=1
     fi
 
@@ -383,8 +349,9 @@ function shutdown {
 }
 
 function update() {
-    bash -c "./Update.py"
+    bin_dir=${AIL_HOME}/bin
 
+    bash -c "python3 $bin_dir/Update.py"
     exitStatus=$?
     if [ $exitStatus -ge 1 ]; then
         echo -e $RED"\t* Update Error"$DEFAULT

bin/check_ardb.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+GREEN="\\033[1;32m"
+DEFAULT="\\033[0;39m"
+RED="\\033[1;31m"
+ROSE="\\033[1;35m"
+BLUE="\\033[1;34m"
+WHITE="\\033[0;02m"
+YELLOW="\\033[1;33m"
+CYAN="\\033[1;36m"
+
+[ -z "$AIL_HOME" ] && echo "Needs the env var AIL_HOME. Run the script from the virtual environment." && exit 1;
+
+flag_ardb=0
+redis_dir=${AIL_HOME}/redis/src/
+sleep 0.2
+bash -c $redis_dir'redis-cli -p 6382 PING | grep "PONG" &> /dev/null'
+if [ ! $? == 0 ]; then
+   echo -e $RED"\t6382 ARDB not ready"$DEFAULT
+   flag_ardb=1
+fi
+
+if [ $flag_ardb == 0 ]; then
+    exit 0
+else
+    exit 1
+fi

bin/check_redis.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+GREEN="\\033[1;32m"
+DEFAULT="\\033[0;39m"
+RED="\\033[1;31m"
+ROSE="\\033[1;35m"
+BLUE="\\033[1;34m"
+WHITE="\\033[0;02m"
+YELLOW="\\033[1;33m"
+CYAN="\\033[1;36m"
+
+[ -z "$AIL_HOME" ] && echo "Needs the env var AIL_HOME. Run the script from the virtual environment." && exit 1;
+
+flag_redis=0
+redis_dir=${AIL_HOME}/redis/src/
+bash -c $redis_dir'redis-cli -p 6379 PING | grep "PONG" &> /dev/null'
+if [ ! $? == 0 ]; then
+   echo -e $RED"\t6379 not ready"$DEFAULT
+   flag_redis=1
+fi
+sleep 0.1
+bash -c $redis_dir'redis-cli -p 6380 PING | grep "PONG" &> /dev/null'
+if [ ! $? == 0 ]; then
+   echo -e $RED"\t6380 not ready"$DEFAULT
+   flag_redis=1
+fi
+sleep 0.1
+bash -c $redis_dir'redis-cli -p 6381 PING | grep "PONG" &> /dev/null'
+if [ ! $? == 0 ]; then
+   echo -e $RED"\t6381 not ready"$DEFAULT
+   flag_redis=1
+fi
+sleep 0.1
+
+if [ $flag_redis == 0 ]; then
+    exit 0
+else
+    exit 1
+fi

bin/launch_ardb.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+GREEN="\\033[1;32m"
+DEFAULT="\\033[0;39m"
+RED="\\033[1;31m"
+ROSE="\\033[1;35m"
+BLUE="\\033[1;34m"
+WHITE="\\033[0;02m"
+YELLOW="\\033[1;33m"
+CYAN="\\033[1;36m"
+
+[ -z "$AIL_HOME" ] && echo "Needs the env var AIL_HOME. Run the script from the virtual environment." && exit 1;
+
+conf_dir="${AIL_HOME}/configs/"
+
+screen -dmS "ARDB_AIL"
+sleep 0.1
+echo -e $GREEN"\t* Launching ARDB servers"$DEFAULT
+
+sleep 0.1
+screen -S "ARDB_AIL" -X screen -t "6382" bash -c 'cd '${AIL_HOME}'; ardb-server '$conf_dir'6382.conf ; read x'

bin/launch_lvldb.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-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/"
-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
-
-#Launch a DB for each dir
-for pathDir in $lvdbdir*/ ; do
-    yDir=$(basename "$pathDir")
-    sleep 0.1
-    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_redis.sh

@@ -1,23 +1,23 @@
 #!/bin/bash
 
-set -e
+GREEN="\\033[1;32m"
-set -x
+DEFAULT="\\033[0;39m"
+RED="\\033[1;31m"
+ROSE="\\033[1;35m"
+BLUE="\\033[1;34m"
+WHITE="\\033[0;02m"
+YELLOW="\\033[1;33m"
+CYAN="\\033[1;36m"
 
 [ -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"
+screen -dmS "Redis_AIL"
 sleep 0.1
 echo -e $GREEN"\t* Launching Redis servers"$DEFAULT
-screen -S "Redis" -X screen -t "6379" bash -c '../redis/src/redis-server '$conf_dir'6379.conf ; read x'
+screen -S "Redis_AIL" -X screen -t "6379" bash -c 'redis-server '$conf_dir'6379.conf ; read x'
 sleep 0.1
-screen -S "Redis" -X screen -t "6380" bash -c '../redis/src/redis-server '$conf_dir'6380.conf ; read x'
+screen -S "Redis_AIL" -X screen -t "6380" bash -c 'redis-server '$conf_dir'6380.conf ; read x'
 sleep 0.1
-screen -S "Redis" -X screen -t "6381" bash -c '../redis/src/redis-server '$conf_dir'6381.conf ; read x'
+screen -S "Redis_AIL" -X screen -t "6381" bash -c 'redis-server '$conf_dir'6381.conf ; read x'
-
-# For Words and curves
-sleep 0.1
-screen -S "Redis" -X screen -t "6382" bash -c '../redis/src/redis-server '$conf_dir'6382.conf ; read x'