From c9bd0cbeb19baffedd3d40b7c8cdd049fc9a89fb Mon Sep 17 00:00:00 2001
From: Blake Fitch <blake.fitch@tuebingen.mpg.de>
Date: Thu, 26 May 2022 17:17:20 +0200
Subject: [PATCH] update log lines
---
pymods/irods_utils/irods_utils.py | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/pymods/irods_utils/irods_utils.py b/pymods/irods_utils/irods_utils.py
index 9110d19..3cdc95a 100644
--- a/pymods/irods_utils/irods_utils.py
+++ b/pymods/irods_utils/irods_utils.py
@@ -370,7 +370,7 @@ def confirmed_put( irods_sesh, file, new_obj_ipath, metadata_dict=None, datatype
+ " new_obj_ipath_tmp " + new_obj_ipath_tmp )
except Exception as ex:
logging.debug( "Failed to get new_obj_ipath_tmp. (OK because we expect to create it.)"
- + " ipath: " + new_obj_ipath_tmp
+ + " tmp ipath: " + new_obj_ipath_tmp
+ " ex: " + str(ex) )
@@ -379,7 +379,10 @@ def confirmed_put( irods_sesh, file, new_obj_ipath, metadata_dict=None, datatype
options = {kw.REG_CHKSUM_KW: '', kw.ALL_KW: ''}
irods_sesh.data_objects.put( file, new_obj_ipath_tmp, **options )
except Exception as axe:
- logging.error("Falied to put data object. ipath: " + new_obj_ipath_tmp + " ex: " + str(axe) )
+ logging.error( "Falied to put data object."
+ + " file: " + file
+ + " tmp ipath: " + new_obj_ipath_tmp
+ + " ex: " + str(axe) )
return None
# Need to do a get so we can apply metadata.
@@ -393,7 +396,7 @@ def confirmed_put( irods_sesh, file, new_obj_ipath, metadata_dict=None, datatype
try:
pydict_to_irods_avus( new_obj, metadata_dict )
except Exception as ex:
- logging.error("Failed to create AVUS. ipath: " + new_obj_ipath_tmp + " ex: " + str(ex) )
+ logging.error("Failed to create AVUS. ipath: " + new_obj_ipath_tmp + " file: " + file + " ex: " + str(ex) )
logging.error("metadata AVU dict >" + str( metadata_dict ) + "<" )
return None
@@ -401,8 +404,9 @@ def confirmed_put( irods_sesh, file, new_obj_ipath, metadata_dict=None, datatype
try:
irods_sesh.data_objects.move( new_obj.path, new_obj_ipath )
except Exception as ex:
- logging.error( "Failed to move an existing object out of the way so can not upload current version."
- + " path " + new_obj.path
+ logging.error( "Failed to move the tmp object to the proper logical path."
+ + " tmp path: " + new_obj.path
+ + " new_obj_ipath: " + new_obj_ipath
+ " ex: " + str( ex ) )
return None
--
GitLab