Tweak previous commit.

Author: hjoliver

cylc/flow/job_runner_mgr.py

@@ -373,14 +373,15 @@ def job_kill(self, st_file_path):
 
     @classmethod
     def _create_nn(cls, job_file_path):
-        """Create NN symbolic link, if necessary.
+        """Create NN symbolic link, or remove old job logs if they exist.
+
+        If NN => 01, remove numbered dirs with submit numbers greater than 01.
 
-        If NN => 01, remove numbered directories with submit numbers greater
-        than 01.
         Helper for "self._job_submit_impl".
 
         """
         job_file_dir = os.path.dirname(job_file_path)
+
         source = os.path.basename(job_file_dir)
         task_log_dir = os.path.dirname(job_file_dir)
         nn_path = os.path.join(task_log_dir, "NN")
@@ -393,6 +394,7 @@ def _create_nn(cls, job_file_path):
             old_source = None
         if old_source is None:
             os.symlink(source, nn_path)
+
         # On submit 1, remove any left over digit directories from prev runs
         if source == "01":
             for name in os.listdir(task_log_dir):
@@ -401,6 +403,11 @@ def _create_nn(cls, job_file_path):
                     rmtree(
                         os.path.join(task_log_dir, name), ignore_errors=True)
 
+        # Delete old job logs if necessary
+        for name in JOB_LOG_ERR, JOB_LOG_OUT:
+            with suppress(FileNotFoundError):
+                os.unlink(os.path.join(job_file_dir, name))
+
     @classmethod
     def _filter_submit_output(cls, st_file_path, job_runner, out, err):
         """Filter submit command output, if relevant."""
@@ -567,9 +574,6 @@ def _job_submit_impl(
 
         # Create NN symbolic link, if necessary
         self._create_nn(job_file_path)
-        for name in JOB_LOG_ERR, JOB_LOG_OUT:
-            with suppress(FileNotFoundError):
-                os.unlink(os.path.join(os.path.dirname(job_file_path), name))
 
         # Start new status file
         with open(f"{job_file_path}.status", "w") as job_status_file: