@@ -308,12 +308,11 @@ def hash_exists(self, updatehash=False):
308
308
309
309
# Remove outdated hashfile
310
310
if hashfiles and hashfiles [0 ] != hashfile :
311
- logger .info ('[Node] Removing outdated hashfile (%s) and forcing node to rerun' ,
312
- op . basename ( hashfiles [ 0 ]) )
311
+ logger .info ('[Node] Outdated hashfile found for "%s", removing and forcing node '
312
+ 'to rerun' , self . fullname )
313
313
314
- # In DEBUG, print diff between hashes
315
- log_debug = config .get ('logging' , 'workflow_level' ) == 'DEBUG'
316
- if log_debug and hash_exists : # Lazy logging - only debug
314
+ # If logging is more verbose than INFO (20), print diff between hashes
315
+ if logger .getEffectiveLevel () < 20 and hash_exists : # Lazy logging: only < INFO
317
316
split_out = split_filename (hashfiles [0 ])
318
317
exp_hash_file_base = split_out [1 ]
319
318
exp_hash = exp_hash_file_base [len ('_0x' ):]
@@ -426,7 +425,7 @@ def run(self, updatehash=False):
426
425
try :
427
426
result = self ._run_interface (execute = True )
428
427
except Exception :
429
- logger .warning ('[Node] Exception "%s" (%s)' , self .fullname , outdir )
428
+ logger .warning ('[Node] Error on "%s" (%s)' , self .fullname , outdir )
430
429
# Tear-up after error
431
430
os .remove (hashfile_unfinished )
432
431
raise
0 commit comments