Merge lp:~ben-hutchings/ensoft-sextant/cleanup-fix into lp:ensoft-sextant

[Ben Hutchings]

Fixed temporary file issue whereby one instance of sextant could delete the temporary files still being used by another instance (run by the same user).

Fixed temporary file issue whereby one instance of sextant could delete the temporary files still being used by another instance (run by the same user).

Unmerged revisions

=== modified file 'src/sextant/db_api.py'
--- src/sextant/db_api.py	2014-12-12 15:02:30 +0000
+++ src/sextant/db_api.py	2014-12-12 15:02:30 +0000
@@ -144,7 +144,7 @@
         self._ssh = connection._ssh
         self._db = connection._db
         
-        self._tmp_dir = '{}-{}'.format(TMP_DIR, getpass.getuser())
+        self._tmp_dir = '{}-{}{}'.format(TMP_DIR, getpass.getuser(), time())
 
         # Make the local tmp file - csv files will be written into here.
         try:
@@ -293,7 +293,14 @@
                                           self.call_writer.file_iter()))
 
         for path in file_paths: 
-            os.remove(path)
+            try:
+                os.remove(path)
+            except OSError as e:
+                # If the file doesn't exist just keep going.
+                if e.errno == os.errno.ENOENT:
+                    pass
+                else:
+                    raise
 
         try_rmdir(self._tmp_dir)
         try_rmdir(TMP_DIR)
 
=== modified file 'src/sextant/sshmanager.py'
--- src/sextant/sshmanager.py	2014-10-17 15:30:14 +0000
+++ src/sextant/sshmanager.py	2014-12-12 15:02:30 +0000
@@ -2,6 +2,7 @@
 import getpass
 import logging
 import subprocess
+import time
 
 """Provide a class to manage an SSH tunnel and controller"""
 __all__ = ('SSHConnectionError', 'SSHCommandError', 'SSHManager')
@@ -82,7 +83,7 @@
         self.remote_port = remote_port
         self.ssh_user = ssh_user
 
-        self._tmp_dir = '{}-{}'.format(TMP_DIR, self.ssh_user or getpass.getuser())
+        self._tmp_dir = '{}-{}{}'.format(TMP_DIR, self.ssh_user or getpass.getuser(), time.time())
 
         self._controller_name = 'sextantcontroller{}'.format(local_port)
         self._is_localhost = is_localhost
 
=== modified file 'src/sextant/web/server.py'
--- src/sextant/web/server.py	2014-12-02 14:00:57 +0000
+++ src/sextant/web/server.py	2014-12-12 15:02:30 +0000
@@ -209,7 +209,6 @@
                 res_code = RESPONSE_CODE_BAD_REQUEST
                 res_msg = "{}".format(e)
                 print('\tfailed {}'.format(datetime.now()))
-                raise
             
             
         if res_code is RESPONSE_CODE_OK: