Record and display worker name correctly

apps/job_processor/models.py

@@ -35,7 +35,7 @@ class Job(object):
         # Run sync or launch async subprocess
         # OR launch 2 processes: monitor & actual process
         node = Node.objects.myself()
-        worker = Worker.objects.create(node=node, name=u'%s-%d' % (node.hostname, os.getpid()))
+        worker = Worker.objects.create(node=node, name=os.getpid())
         try:
             close_connection()
             transaction.commit_on_success(function)(**loads(job_queue_item.kwargs))
@@ -181,6 +181,9 @@ class Worker(models.Model):
         default=WORKER_STATE_RUNNING,
         verbose_name=_(u'state'))
 
+    def __unicode__(self):
+        return u'%s-%s' % (self.node.hostname, self.name)
+
     #def disable(self):
     #    if self.state == WORKER_STATE_DISABLED:
     #        raise WorkerAlreadyDisabled