diff --git a/synda/sdt/sddmdefault.py b/synda/sdt/sddmdefault.py index 19d3aeaf..926e548e 100755 --- a/synda/sdt/sddmdefault.py +++ b/synda/sdt/sddmdefault.py @@ -344,7 +344,14 @@ def transfers_begin(transfers): "Exception occured while retrieving certificate ({})".format(e), ) - raise + sdlog.error("SDDMDEFA-503"," continue_on_cert_errors=%s"% + preferences.is_download_continue_on_cert_errors ) + if preferences.is_download_continue_on_cert_errors: + sdlog.error("SDDMDEFA-504","Ignoring exception") + pass # Try to keep on going, probably a certificate isn't needed. + else: + sdlog.error("SDDMDEFA-505","Re-raising exception") + raise for tr in transfers: start_transfer_thread(tr) diff --git a/synda/source/config/file/user/preferences/dao/create/models.py b/synda/source/config/file/user/preferences/dao/create/models.py index b6e31469..b1ff4dde 100755 --- a/synda/source/config/file/user/preferences/dao/create/models.py +++ b/synda/source/config/file/user/preferences/dao/create/models.py @@ -110,7 +110,7 @@ def __init__(self, full_filename): config.set('download', 'http_fallback', 'false') config.set('download', 'gridftp_opt', '') # config.set('download', 'incremental_mode_for_datasets', 'false') - # config.set('download', 'continue_on_cert_errors', 'false') + config.set('download', 'continue_on_cert_errors', 'false') config.set('download', 'url_max_buffer_size', '3500') # nouvelles variables diff --git a/synda/source/config/file/user/preferences/models.py b/synda/source/config/file/user/preferences/models.py index c5598153..d2d34929 100755 --- a/synda/source/config/file/user/preferences/models.py +++ b/synda/source/config/file/user/preferences/models.py @@ -169,6 +169,10 @@ def download_max_parallel_download_per_datanode(self): def download_url_max_buffer_size(self): return self.get_data().getint('download', 'url_max_buffer_size') + @property + def is_download_continue_on_cert_errors(self): + return self.get_data().getboolean('download', 'continue_on_cert_errors') + @property def download_gridftp_opt(self): return self.get_data().get('download', 'gridftp_opt')