Skip to content
Snippets Groups Projects
Commit a4178bc3 authored by Florian Spreckelsen's avatar Florian Spreckelsen
Browse files

Merge branch 'f-datamodel' into 'dev'

ENH: treat datamodel problems at more places

See merge request caosdb/caosdb-advanced-user-tools!55
parents 65de5439 acda2fd5
No related branches found
No related tags found
1 merge request!22Release 0.3
...@@ -199,6 +199,10 @@ class Crawler(object): ...@@ -199,6 +199,10 @@ class Crawler(object):
logger.debug(traceback.format_exc()) logger.debug(traceback.format_exc())
logger.debug(e) logger.debug(e)
except Exception as e: except Exception as e:
try:
DataModelProblems.evaluate_exception(e)
except BaseException:
pass
logger.debug("Failed during execution of {}!".format( logger.debug("Failed during execution of {}!".format(
Cfood.__name__)) Cfood.__name__))
logger.debug(traceback.format_exc()) logger.debug(traceback.format_exc())
...@@ -215,10 +219,12 @@ class Crawler(object): ...@@ -215,10 +219,12 @@ class Crawler(object):
for cfood in cfoods: for cfood in cfoods:
cfood.collect_information() cfood.collect_information()
logger.debug(separated("Trying to attach further items to created CFoods")) logger.debug(
separated("Trying to attach further items to created CFoods"))
for cfood in cfoods: for cfood in cfoods:
logger.debug("Matching against {}...".format(cfood.__class__.__name__)) logger.debug("Matching against {}...".format(
cfood.__class__.__name__))
for idx, item in self.iteritems(): for idx, item in self.iteritems():
if cfood.looking_for(item): if cfood.looking_for(item):
...@@ -284,6 +290,10 @@ class Crawler(object): ...@@ -284,6 +290,10 @@ class Crawler(object):
logger.debug(traceback.format_exc()) logger.debug(traceback.format_exc())
logger.debug(e) logger.debug(e)
except Exception as e: except Exception as e:
try:
DataModelProblems.evaluate_exception(e)
except BaseException:
pass
logger.info("Failed during execution of {}!".format( logger.info("Failed during execution of {}!".format(
cfood.__class__.__name__)) cfood.__class__.__name__))
logger.debug(traceback.format_exc()) logger.debug(traceback.format_exc())
...@@ -301,7 +311,8 @@ class Crawler(object): ...@@ -301,7 +311,8 @@ class Crawler(object):
# only done in SSS mode # only done in SSS mode
if "SHARED_DIR" in os.environ: if "SHARED_DIR" in os.environ:
filename = self.save_form([el[3] for el in pending_changes], path) filename = self.save_form([el[3]
for el in pending_changes], path)
self.send_mail([el[3] for el in pending_changes], filename) self.send_mail([el[3] for el in pending_changes], filename)
for i, el in enumerate(pending_changes): for i, el in enumerate(pending_changes):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment