X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=openmanod.py;h=761e912381f197dc6399c9f3fd35f9540ee32524;hb=c75a5dc7e6957be0b95f96ea7895e677e847550c;hp=fcfd11c6566258e76683e7eb2a35cd4148557491;hpb=a3d49e652822eff18b39a2fc43f9d48da17013cc;p=osm%2FRO.git

diff --git a/openmanod.py b/openmanod.py
index fcfd11c6..761e9123 100755
--- a/openmanod.py
+++ b/openmanod.py
@@ -33,9 +33,9 @@ It loads the configuration file and launches the http_server thread that will li
 '''
 __author__="Alfonso Tierno, Gerardo Garcia, Pablo Montes"
 __date__ ="$26-aug-2014 11:09:29$"
-__version__="0.5.1-r508"
-version_date="Oct 2016"
-database_version="0.15"      #expected database schema version
+__version__="0.5.5-r514"
+version_date="Jan 2017"
+database_version="0.19"      #expected database schema version
 
 import httpserver
 import time
@@ -45,6 +45,7 @@ import yaml
 import nfvo_db
 from jsonschema import validate as js_v, exceptions as js_e
 from openmano_schemas import config_schema
+from db_base import db_base_Exception
 import nfvo
 import logging
 import logging.handlers as log_handlers
@@ -236,9 +237,10 @@ if __name__=="__main__":
                 raise LoadConfigurationException("Cannot open logging file '{}': {}. Check folder exist and permissions".format(global_config["log_file"], str(e)) ) 
         #logging.basicConfig(level = getattr(logging, global_config.get('log_level',"debug")))
         logger.setLevel(getattr(logging, global_config['log_level']))
-        logger.critical("Starting openmano server command: '%s'", sys.argv[0])
+        logger.critical("Starting openmano server version: '%s %s' command: '%s'",  
+                         __version__, version_date, " ".join(sys.argv))
         
-        for log_module in ("nfvo", "http", "vim", "db"):
+        for log_module in ("nfvo", "http", "vim", "db", "console"):
             log_level_module = "log_level_" + log_module
             log_file_module = "log_file_" + log_module
             logger_module = logging.getLogger('openmano.' + log_module)
@@ -257,17 +259,19 @@ if __name__=="__main__":
         
         # Initialize DB connection
         mydb = nfvo_db.nfvo_db();
-        if mydb.connect(global_config['db_host'], global_config['db_user'], global_config['db_passwd'], global_config['db_name']) == -1:
-            logger.critical("Cannot connect to database %s at %s@%s", global_config['db_name'], global_config['db_user'], global_config['db_host'])
+        mydb.connect(global_config['db_host'], global_config['db_user'], global_config['db_passwd'], global_config['db_name'])
+        try:
+            r = mydb.get_db_version()
+            if r[1] != database_version:
+                logger.critical("DATABASE wrong version '%s'. \
+                                Try to upgrade/downgrade to version '%s' with './database_utils/migrate_mano_db.sh'",
+                                r[1], database_version)
+                exit(-1)
+        except db_base_Exception as e:
+            logger.critical("DATABASE is not a MANO one or it is a '0.0' version. Try to upgrade to version '%s' with \
+                            './database_utils/migrate_mano_db.sh'", database_version)
             exit(-1)
-        r = mydb.get_db_version()
-        if r[0]<0:
-            logger.critical("DATABASE is not a MANO one or it is a '0.0' version. Try to upgrade to version '%s' with './database_utils/migrate_mano_db.sh'", database_version)
-            exit(-1)
-        elif r[1]!=database_version:
-            logger.critical("DATABASE wrong version '%s'. Try to upgrade/downgrade to version '%s' with './database_utils/migrate_mano_db.sh'", r[1], database_version)
-            exit(-1)
-        
+
         nfvo.global_config=global_config
         
         httpthread = httpserver.httpserver(mydb, False, global_config['http_host'], global_config['http_port'])
@@ -305,4 +309,7 @@ if __name__=="__main__":
     except LoadConfigurationException as e:
         logger.critical(str(e))
         exit(-1)
+    except db_base_Exception as e:
+        logger.critical(str(e))
+        exit(-1)