rename 'inform()' to 'notify()'
git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@2494 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
		
							parent
							
								
									4d8f1e7cf1
								
							
						
					
					
						commit
						7da8c3b9d1
					
				
					 4 changed files with 9 additions and 8 deletions
				
			
		|  | @ -90,8 +90,9 @@ class Master(Agent): | ||||||
|             job.controller = controller |             job.controller = controller | ||||||
|             self.scheduler.schedule(job, spec.startTime) |             self.scheduler.schedule(job, spec.startTime) | ||||||
| 
 | 
 | ||||||
|     def inform(self, job, result=None, message=''): |     def notify(self, job, result=None, message=''): | ||||||
|         job.controller.inform(job.identifier, job.state, result, message) |         if job.state.hasFinished(): | ||||||
|  |             job.controller.notify(job.identifier, job.state, result, message) | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| class SampleAgent(Agent): | class SampleAgent(Agent): | ||||||
|  | @ -101,6 +102,6 @@ class SampleAgent(Agent): | ||||||
|         print 'Job %s on agent %s has been executed.' % (job.identifier, self.name) |         print 'Job %s on agent %s has been executed.' % (job.identifier, self.name) | ||||||
|         self.log(job) |         self.log(job) | ||||||
|         job.state = states.completed |         job.state = states.completed | ||||||
|         self.master.inform(job) |         self.master.notify(job) | ||||||
| 
 | 
 | ||||||
| agents.register(SampleAgent, Master, name='base.sample') | agents.register(SampleAgent, Master, name='base.sample') | ||||||
|  |  | ||||||
|  | @ -46,7 +46,7 @@ class Controller(object): | ||||||
|     def _getCurrentJobs(self): |     def _getCurrentJobs(self): | ||||||
|         return [] |         return [] | ||||||
| 
 | 
 | ||||||
|     def inform(self, identifier, state, result=None, message=''): |     def notify(self, identifier, state, result=None, message=''): | ||||||
|         pass |         pass | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  | @ -56,7 +56,7 @@ class SampleController(Controller): | ||||||
| 
 | 
 | ||||||
|     agents = (('sample01', 'base.sample'),) |     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' % |         msg = ('Job %s %s; result: %s; %s' % | ||||||
|                (identifier, state, result, message)) |                (identifier, state, result, message)) | ||||||
|         print msg |         print msg | ||||||
|  |  | ||||||
|  | @ -66,14 +66,14 @@ class QueueableAgent(Agent): | ||||||
|         job = self.currentJob |         job = self.currentJob | ||||||
|         job.state = states.completed |         job.state = states.completed | ||||||
|         self.log(job) |         self.log(job) | ||||||
|         self.master.inform(job, result) |         self.master.notify(job, result) | ||||||
|         self.finishJob() |         self.finishJob() | ||||||
| 
 | 
 | ||||||
|     def error(self, result): |     def error(self, result): | ||||||
|         print '*** error', result |         print '*** error', result | ||||||
|         job.state = states.aborted |         job.state = states.aborted | ||||||
|         self.log(self.currentJob, result='Error') |         self.log(self.currentJob, result='Error') | ||||||
|         self.master.inform(job, result) |         self.master.notify(job, result) | ||||||
|         self.finishJob() |         self.finishJob() | ||||||
| 
 | 
 | ||||||
|     def finishJob(self): |     def finishJob(self): | ||||||
|  |  | ||||||
|  | @ -95,7 +95,7 @@ class IMaster(IAgent): | ||||||
|             wants to provide new job information. |             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. |         """ Callback for informing the master about the state of a job. | ||||||
|         """ |         """ | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 helmutm
						helmutm