diff --git a/agent/base/agent.py b/agent/base/agent.py index 961ebaa..3de42ea 100644 --- a/agent/base/agent.py +++ b/agent/base/agent.py @@ -90,8 +90,9 @@ class Master(Agent): job.controller = controller self.scheduler.schedule(job, spec.startTime) - def inform(self, job, result=None, message=''): - job.controller.inform(job.identifier, job.state, result, message) + def notify(self, job, result=None, message=''): + if job.state.hasFinished(): + job.controller.notify(job.identifier, job.state, result, message) class SampleAgent(Agent): @@ -101,6 +102,6 @@ class SampleAgent(Agent): print 'Job %s on agent %s has been executed.' % (job.identifier, self.name) self.log(job) job.state = states.completed - self.master.inform(job) + self.master.notify(job) agents.register(SampleAgent, Master, name='base.sample') diff --git a/agent/base/control.py b/agent/base/control.py index 481818f..298196d 100644 --- a/agent/base/control.py +++ b/agent/base/control.py @@ -46,7 +46,7 @@ class Controller(object): def _getCurrentJobs(self): return [] - def inform(self, identifier, state, result=None, message=''): + def notify(self, identifier, state, result=None, message=''): pass @@ -56,7 +56,7 @@ class SampleController(Controller): agents = (('sample01', 'base.sample'),) - def inform(self, identifier, state, result=None, message=''): + def notify(self, identifier, state, result=None, message=''): msg = ('Job %s %s; result: %s; %s' % (identifier, state, result, message)) print msg diff --git a/agent/core/agent.py b/agent/core/agent.py index 6e2bb31..63256b3 100644 --- a/agent/core/agent.py +++ b/agent/core/agent.py @@ -66,14 +66,14 @@ class QueueableAgent(Agent): job = self.currentJob job.state = states.completed self.log(job) - self.master.inform(job, result) + self.master.notify(job, result) self.finishJob() def error(self, result): print '*** error', result job.state = states.aborted self.log(self.currentJob, result='Error') - self.master.inform(job, result) + self.master.notify(job, result) self.finishJob() def finishJob(self): diff --git a/agent/interfaces.py b/agent/interfaces.py index d5a5b0a..2be649b 100644 --- a/agent/interfaces.py +++ b/agent/interfaces.py @@ -95,7 +95,7 @@ class IMaster(IAgent): wants to provide new job information. """ - def inform(job, result=None, message=''): + def notify(job, result=None, message=''): """ Callback for informing the master about the state of a job. """