git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
[sfa.git]
/
sfa
/
managers
/
import_manager.py
diff --git
a/sfa/managers/import_manager.py
b/sfa/managers/import_manager.py
index
65c92c0
..
f5f30c4
100644
(file)
--- a/
sfa/managers/import_manager.py
+++ b/
sfa/managers/import_manager.py
@@
-1,3
+1,5
@@
+from sfa.util.sfalogging import logger
+
def import_manager(kind, type):
"""
kind expected in ['registry', 'aggregate', 'slice', 'component']
def import_manager(kind, type):
"""
kind expected in ['registry', 'aggregate', 'slice', 'component']
@@
-6,14
+8,19
@@
def import_manager(kind, type):
basepath = 'sfa.managers'
qualified = "%s.%s_manager_%s"%(basepath,kind,type)
generic = "%s.%s_manager"%(basepath,kind)
basepath = 'sfa.managers'
qualified = "%s.%s_manager_%s"%(basepath,kind,type)
generic = "%s.%s_manager"%(basepath,kind)
+
+ message="import_manager for kind=%s and type=%s"%(kind,type)
try:
manager = __import__(qualified, fromlist=[basepath])
try:
manager = __import__(qualified, fromlist=[basepath])
+ logger.info ("%s: loaded %s"%(message,qualified))
except:
try:
manager = __import__ (generic, fromlist=[basepath])
if type != 'pl' :
except:
try:
manager = __import__ (generic, fromlist=[basepath])
if type != 'pl' :
- logger.warn ("Using generic manager for %s with type=%s"%(kind,type))
+ logger.warn ("%s: using generic with type!='pl'"%(message))
+ logger.info("%s: loaded %s"%(message,generic))
except:
manager=None
except:
manager=None
+ logger.log_exc("%s: unable to import either %s or %s"%(message,qualified,generic))
return manager
return manager