added JobManager logging to syslog (f4d2e5af) · Commits · Mirror / cc-node

ccnode/jobs.py

+8 −3

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		import os, time, socket
		from datetime import datetime
		from threading import Thread, RLock
		from logging import debug
		from utils import RWLock
		from errors import (JobManagerError, JobError, XferJobError, ReceiveFileJobError,
		SendFileJobError)
		@@ -31,10 +32,11 @@ class JobManager(Thread, object):
		def _job_crashed(self, jid):
		'''
		'''
		debug('JobManager._job_crashed: id=`%i`' % jid)
		with self._mutex:
		# job should exist
		if jid not in self._jobs:
		raise JobManagerError('unknown job ID `%i`' % jid)
		raise JobManagerError('unknown job ID `%i`', jid)
		# move job to the crashed queue
		self._jobs_crashed.append(jid)
		# clean any queue that may contain the job
		@@ -44,10 +46,11 @@ class JobManager(Thread, object):
		queue.remove(jid)

		def _job_finished(self, jid):
		debug('JobManager._job_finished: id=`%i`' % jid)
		with self._mutex:
		# job should exist
		if jid not in self._jobs:
		raise JobManagerError('unknown job ID `%i`' % jid)
		raise JobManagerError('unknown job ID `%i`', jid)
		# move job to the finished queue
		self._jobs_finished.append(jid)
		# remove from running queue
		@@ -61,6 +64,7 @@ class JobManager(Thread, object):
		self._next_jid += 1
		self._jobs[jid] = job
		self._jobs_pending.append(jid)
		debug('JobManager.append: new job pending with id `%i`', jid)
		return jid

		def run(self):
		@@ -72,6 +76,7 @@ class JobManager(Thread, object):
		def schedule_immediate(self, jid):
		'''
		'''
		debug('JobManager.schedule_immediate: id=`%i`', jid)
		with self._mutex:
		# job should exist
		if jid not in self._jobs:
		@@ -138,7 +143,7 @@ class JobLog():
		def append(self, message):
		'''
		'''
		print "JobLog : %s" % message
		debug('JobLog.append: %s', message)
		with self._mutex:
		self._items.append((time.time(), message))