Bugfix in slim + enhancement of mass_deploy

Now mass_deploy is able to stop when slim fails indicating on wich action slim fails
Bufixing webui conf edition

progs/mass_deploy.sh

@@ -19,6 +19,16 @@ usage() {
 \t\t- purgedb is to remove all created mongodb db\n"
 }
 
+slim_fails() {
+	if [ -z "$1" ]
+	then
+		echo "SLIM fails for some reason. Abording..." >&2
+	else
+		echo "SLIM fails when $1. Abording...." >&2
+	fi
+	exit 1
+}
+
 test -f $conffile || badconf
 #Load conffile
 . $conffile
@@ -111,9 +121,9 @@ echo "Creating instances"
 for i in $(seq $ninstance)
 do
 	iname="${random_name}_$(printf "%05d" $i)"
-	slim -n $iname -c
-	slim -n $iname -s --interface web --static-url 'http://127.0.0.1/static' --uwsgi-workers 2
-	slim -n $iname -m
+	slim -n $iname -c || slim_fails "creating instance"
+	slim -n $iname -s --interface web --static-url 'http://127.0.0.1/static' --uwsgi-workers 2 || slim_fails "configuring instancee"
+	slim -n $iname -m || slim_fails "running make in instance"
 
 	#Mongo db database creation
 	dbname="${MONGODB_DB_PREFIX}_$iname"
@@ -125,7 +135,7 @@ db.addUser('$dbuser', '$dbpass', ['readWrite', '$dbname'])
 exit
 EOF
 	#Append created db to instance conf
-	slim -n $iname -s --datasource_connectors mongodb --host localhost --user $dbuser --password $dbpass --db_name $dbname
+	slim -n $iname -s --datasource_connectors mongodb --host localhost --user $dbuser --password $dbpass --db_name $dbname || slim_fails "configuring the instance's datasource"
 
 done
 

progs/slim/slim.py

@@ -94,14 +94,14 @@ def set_conf(name, args):
             config['lodel2.webui']['listen_address'] = str(args.listen_address)
         if args.static_url is not None:
             config['lodel2.webui']['static_url'] = str(args.static_url)
+        if args.uwsgi_workers is not None:
+            config['lodel2.webui']['uwsgi_workers'] = str(args.uwsgi_workers)
     else: #interface is python
         if args.listen_port is not None or args.listen_address is not None:
             logging.error("Listen port and listen address will not being set. \
 Selected interface is not the web iterface")
         if 'lodel.webui' in config:
             del(config['lodel2.webui'])
-        if args.uwsgi_workers is not None:
-            config['lodel2.webui']['uwsgi_workers'] = int(args.uwsgi_workers)
 
     if args.datasource_connectors is not None:
         darg = args.datasource_connectors
@@ -491,8 +491,8 @@ to 1 instance")
         help="Select the password name to connect the datasource")
     confs.add_argument('--db_name', type=str,
         help="Select the database name on which datasource will be connect")
-    confs.add_argument('-p', '--uwsgi-workers', type=str, default='2',
-                       help="Number of workers to spawn at the start of uwsgi")
+    confs.add_argument('--uwsgi-workers', type=int, default='2',
+        metavar = 'N', help="Number of workers to spawn at the start of uwsgi")
     return parser
 
 if __name__ == '__main__':