Skip to content
Snippets Groups Projects
Commit c9bd0cbe authored by Blake Fitch's avatar Blake Fitch
Browse files

update log lines

parent 722e6a17
No related branches found
No related tags found
No related merge requests found
...@@ -370,7 +370,7 @@ def confirmed_put( irods_sesh, file, new_obj_ipath, metadata_dict=None, datatype ...@@ -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 ) + " new_obj_ipath_tmp " + new_obj_ipath_tmp )
except Exception as ex: except Exception as ex:
logging.debug( "Failed to get new_obj_ipath_tmp. (OK because we expect to create it.)" 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) ) + " ex: " + str(ex) )
...@@ -379,7 +379,10 @@ def confirmed_put( irods_sesh, file, new_obj_ipath, metadata_dict=None, datatype ...@@ -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: ''} options = {kw.REG_CHKSUM_KW: '', kw.ALL_KW: ''}
irods_sesh.data_objects.put( file, new_obj_ipath_tmp, **options ) irods_sesh.data_objects.put( file, new_obj_ipath_tmp, **options )
except Exception as axe: 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 return None
# Need to do a get so we can apply metadata. # 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 ...@@ -393,7 +396,7 @@ def confirmed_put( irods_sesh, file, new_obj_ipath, metadata_dict=None, datatype
try: try:
pydict_to_irods_avus( new_obj, metadata_dict ) pydict_to_irods_avus( new_obj, metadata_dict )
except Exception as ex: 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 ) + "<" ) logging.error("metadata AVU dict >" + str( metadata_dict ) + "<" )
return None return None
...@@ -401,8 +404,9 @@ def confirmed_put( irods_sesh, file, new_obj_ipath, metadata_dict=None, datatype ...@@ -401,8 +404,9 @@ def confirmed_put( irods_sesh, file, new_obj_ipath, metadata_dict=None, datatype
try: try:
irods_sesh.data_objects.move( new_obj.path, new_obj_ipath ) irods_sesh.data_objects.move( new_obj.path, new_obj_ipath )
except Exception as ex: except Exception as ex:
logging.error( "Failed to move an existing object out of the way so can not upload current version." logging.error( "Failed to move the tmp object to the proper logical path."
+ " path " + new_obj.path + " tmp path: " + new_obj.path
+ " new_obj_ipath: " + new_obj_ipath
+ " ex: " + str( ex ) ) + " ex: " + str( ex ) )
return None return None
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment