Skip to content

Commit

Permalink
Merge pull request #1417 from pyiron/error_do_not_depend_on_job
Browse files Browse the repository at this point in the history
Modify GenericError to use the working_directory rather than the job
  • Loading branch information
jan-janssen committed Apr 30, 2024
2 parents 274a669 + e3751e6 commit 0a6c4bb
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions pyiron_base/jobs/job/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ def __init__(self, project, job_name):
self._python_only_job = False
self._write_work_dir_warnings = True
self.interactive_cache = None
self.error = GenericError(job=self)
self.error = GenericError(working_directory=self.project_hdf5.working_directory)

@property
def version(self):
Expand Down Expand Up @@ -1569,8 +1569,8 @@ def _get_executor(self, max_workers=None):


class GenericError(object):
def __init__(self, job):
self._job = job
def __init__(self, working_directory):
self._working_directory = working_directory

def __repr__(self):
all_messages = ""
Expand All @@ -1588,7 +1588,8 @@ def print_queue(self, string=""):
return self._print_error(file_name="error.out", string=string)

def _print_error(self, file_name, string="", print_yes=True):
if self._job[file_name] is None:
if not os.path.exists(os.path.join(self._working_directory, file_name)):
return ""
elif print_yes:
return string.join(self._job[file_name])
with open(os.path.join(self._working_directory, file_name)) as f:
return string.join(f.readlines())

0 comments on commit 0a6c4bb

Please sign in to comment.