jdahlin - in flumotion/trunk: . flumotion/worker

[flumotion-commit at lists.fluendo.com]

Author: jdahlin
Date: Mon Jan  7 18:12:48 2008
New Revision: 6069

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/worker/job.py
Log:
2008-01-07  Johan Dahlin  <johan at gnome.org>

	* flumotion/worker/job.py (CheckJobHeaven.timeout): job.pid, not
	process.pid. Remove unused import too.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Mon Jan  7 18:12:48 2008
@@ -1,3 +1,8 @@
+2008-01-07  Johan Dahlin  <johan at gnome.org>
+
+	* flumotion/worker/job.py (CheckJobHeaven.timeout): job.pid, not
+	process.pid. Remove unused import too.
+
 2008-01-07  Arek Korbik  <arkadini at gmail.com>
 
 	* flumotion/admin/gtk/main.py:

Modified: flumotion/trunk/flumotion/worker/job.py
==============================================================================
--- flumotion/trunk/flumotion/worker/job.py	(original)
+++ flumotion/trunk/flumotion/worker/job.py	Mon Jan  7 18:12:48 2008
@@ -32,7 +32,7 @@
 from twisted.internet import defer, reactor
 
 from flumotion.common import errors, log
-from flumotion.common import common, messages
+from flumotion.common import messages
 
 N_ = messages.N_
 T_ = messages.gettexter('flumotion')
@@ -260,7 +260,6 @@
 
     def perspective_cleanShutdown(self):
         self.debug("job is stopping")
-        pass
 
 
 class CheckJobHeaven(base.BaseJobHeaven):
@@ -320,7 +319,7 @@
                                           methodName, *args, **kwargs)
 
             def timeout(sig):
-                self.killJobByPid(process.pid, sig)
+                self.killJobByPid(job.pid, sig)
 
             def haveResult(res):
                 if not termtimeout.active():