Merge "v0.4.61 fixed 37 Deploying multisite get properly the information from sites...

[osm/RO.git] / openmanod.py

diff --git a/openmanod.py b/openmanod.py
index a1015d5..d01ea64 100755 (executable)
--- 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.4.53-r495"
-version_date="Sep 2016"
-database_version="0.13"      #expected database schema version
+__version__="0.4.61-r505"
+version_date="Oct 2016"
+database_version="0.15"      #expected database schema version
 
 import httpserver
 import time
@@ -62,9 +62,6 @@ def load_configuration(configuration_file):
                      'http_console_proxy': True,
                      'http_console_host': None,
                      'log_level': 'DEBUG',
-                     'log_level_db': 'ERROR',
-                     'log_level_vimconn': 'DEBUG',
-                     'log_level_nfvo': 'DEBUG',
                      'log_socket_port': 9022,
                     }
     try:
@@ -176,7 +173,7 @@ if __name__=="__main__":
                 port_admin = a
             elif o == "--log-socket-port":
                 log_socket_port = a
-            elif o == "--log-socket-port":
+            elif o == "--log-socket-host":
                 log_socket_host = a
             elif o == "--log-file":
                 log_file = a
@@ -259,7 +256,7 @@ if __name__=="__main__":
         #nfvo.logger = global_config["logger_nfvo"]
         
         # Initialize DB connection
-        mydb = nfvo_db.nfvo_db(log_level=global_config["log_level_db"]);
+        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'])
             exit(-1)