From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 15 Dec 2011 16:50:07 +0000 (+0100)
Subject: replace SFA_API_DEBUG (bool) with SFA_API_LOGLEVEL (int)
X-Git-Tag: sfa-2.0-6~4
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=594a6ec255180c073e622c4a96fc08494087b3a8

replace SFA_API_DEBUG (bool) with SFA_API_LOGLEVEL (int)
---

diff --git a/config/default_config.xml b/config/default_config.xml
index 9156cb32..6158905d 100644
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -39,10 +39,10 @@ Thierry Parmentelat
           <description>The path to the default credential schema</description>
         </variable>
 
-        <variable id="api_debug" type="boolean">
+        <variable id="api_loglevel" type="int">
           <name>Debug</name>
-          <value>false</value>
-          <description>Flag to turn debug on.</description>
+          <value>0</value>
+          <description>Logging level; 0=minimum, 1=info, 2=debug</description>
         </variable>
     
         <variable id="max_slice_renew" type="int">
diff --git a/config/gen-sfa-cm-config.py b/config/gen-sfa-cm-config.py
index f8a0f70f..abbf3d3d 100755
--- a/config/gen-sfa-cm-config.py
+++ b/config/gen-sfa-cm-config.py
@@ -14,7 +14,7 @@ all_vars = ['SFA_CONFIG_DIR', 'SFA_DATA_DIR', 'SFA_INTERFACE_HRN',
             'SFA_AGGREGATE_HOST', 'SFA_AGGREGATE_PORT', 
             'SFA_SM_HOST', 'SFA_SM_PORT',
             'SFA_CM_ENABLED', 'SFA_CM_HOST', 'SFA_CM_PORT', 'SFA_CM_TYPE', 'SFA_CM_SLICE_PREFIX',
-            'SFA_API_DEBUG']
+            'SFA_API_LOGLEVEL']
 
 defaults = {
     'SFA_CM_ENABLED': '1',
@@ -22,7 +22,7 @@ defaults = {
     'SFA_CM_PORT': '12346',
     'SFA_CM_SLICE_PREFIX': plc_config.PLC_SLICE_PREFIX,
     'SFA_CM_TYPE': 'pl',
-    'SFA_API_DEBUG': '0'
+    'SFA_API_LOGLEVEL': '0'
     }
 
 host_defaults = {
diff --git a/config/sfa_component_config b/config/sfa_component_config
index 1bb57c8b..39580155 100644
--- a/config/sfa_component_config
+++ b/config/sfa_component_config
@@ -5,9 +5,9 @@
 # Human readable name for this interface
 SFA_INTERFACE_HRN="plc"   
 
-# API Debug
-# Are we logging
-SFA_API_DEBUG=1
+# loglevel
+# How deep are we logging (0|1|2)
+SFA_API_LOGLEVEL=1
 
 ## ============================================================
 # Registry Configuration
diff --git a/sfa/importer/sfa-import-plc.py b/sfa/importer/sfa-import-plc.py
index d41bbd4c..2371536f 100755
--- a/sfa/importer/sfa-import-plc.py
+++ b/sfa/importer/sfa-import-plc.py
@@ -71,7 +71,7 @@ def main():
     keys_filename = config.config_path + os.sep + 'person_keys.py' 
     sfaImporter = sfaImport()
     logger=sfaImporter.logger
-    if config.SFA_API_DEBUG: logger.setLevelDebug()
+    logger.setLevelFromOptVerbose(config.SFA_API_LOGLEVEL)
     shell = sfaImporter.shell
     
     # initialize registry db table
diff --git a/sfa/server/sfa-start.py b/sfa/server/sfa-start.py
index 8f6faf24..caf953b3 100755
--- a/sfa/server/sfa-start.py
+++ b/sfa/server/sfa-start.py
@@ -172,14 +172,13 @@ def main():
          help="run component server", default=False)
     parser.add_option("-t", "--trusted-certs", dest="trusted_certs", action="store_true",
          help="refresh trusted certs", default=False)
-    parser.add_option("-v", "--verbose", action="count", dest="verbose", default=0,
-         help="verbose mode - cumulative")
     parser.add_option("-d", "--daemon", dest="daemon", action="store_true",
          help="Run as daemon.", default=False)
     (options, args) = parser.parse_args()
     
     config = Config()
-    if config.SFA_API_DEBUG: pass
+    logger.setLevelFromOptVerbose(config.SFA_API_LOGLEVEL)
+    
 
     # ge the server's key and cert
     hierarchy = Hierarchy()