git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9961beb
)
replace SFA_API_DEBUG (bool) with SFA_API_LOGLEVEL (int)
author
Thierry Parmentelat
<thierry.parmentelat@sophia.inria.fr>
Thu, 15 Dec 2011 16:50:07 +0000
(17:50 +0100)
committer
Thierry Parmentelat
<thierry.parmentelat@sophia.inria.fr>
Thu, 15 Dec 2011 16:50:07 +0000
(17:50 +0100)
config/default_config.xml
patch
|
blob
|
history
config/gen-sfa-cm-config.py
patch
|
blob
|
history
config/sfa_component_config
patch
|
blob
|
history
sfa/importer/sfa-import-plc.py
patch
|
blob
|
history
sfa/server/sfa-start.py
patch
|
blob
|
history
diff --git
a/config/default_config.xml
b/config/default_config.xml
index
9156cb3
..
6158905
100644
(file)
--- 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>
<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>
<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">
</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
f8a0f70
..
abbf3d3
100755
(executable)
--- 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_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',
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_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 = {
}
host_defaults = {
diff --git
a/config/sfa_component_config
b/config/sfa_component_config
index
1bb57c8
..
3958015
100644
(file)
--- a/
config/sfa_component_config
+++ b/
config/sfa_component_config
@@
-5,9
+5,9
@@
# Human readable name for this interface
SFA_INTERFACE_HRN="plc"
# 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
## ============================================================
# Registry Configuration
diff --git
a/sfa/importer/sfa-import-plc.py
b/sfa/importer/sfa-import-plc.py
index
d41bbd4
..
2371536
100755
(executable)
--- 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
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
shell = sfaImporter.shell
# initialize registry db table
diff --git
a/sfa/server/sfa-start.py
b/sfa/server/sfa-start.py
index
8f6faf2
..
caf953b
100755
(executable)
--- 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)
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()
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()
# ge the server's key and cert
hierarchy = Hierarchy()