[cig-commits] commit: Uncomment cleanup code and improve error logging

[Mercurial]

changeset:   38:cf29572b20ee
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Mon Oct 24 11:37:22 2011 -0700
files:       backend/daemon.py
description:
Uncomment cleanup code and improve error logging


diff -r 5cb56a35cfdb -r cf29572b20ee backend/daemon.py
--- a/backend/daemon.py	Mon Oct 24 11:35:53 2011 -0700
+++ b/backend/daemon.py	Mon Oct 24 11:37:22 2011 -0700
@@ -267,12 +267,12 @@ class RemoteShellJobManager(ForkJobManag
         return
 
     def cleanupJob(self, job):
-        # remoteDirectory = self.remoteDirectoryForJob(job)
-        # argv = self.rsh + [("rm -rf " + remoteDirectory)]
-        # try:
-        #     self.spawn(*argv)
-        # except Exception:
-        #     pass
+        remoteDirectory = self.remoteDirectoryForJob(job)
+        argv = self.rsh + [("rm -rf " + remoteDirectory)]
+        try:
+            self.spawn(*argv)
+        except Exception:
+            pass
         return
 
 
@@ -603,7 +603,7 @@ class PortalConnection(object):
                 infile = urllib2.urlopen(self.portal.runsUrl)
             except Exception, e:
                 # Could be transient failure -- e.g., "connection reset by peer".
-                self.info.log("error: %s" % e)
+                self.info.log("error when opening url\n  %s\n  %s" % e)
                 continue
             #self.info.log("OK")
             runList = infile.read()