Commit f5b43a4e authored Sep 14, 2020 by Cristiano Urban

Moved JobCache object definition from AMQPServer class to inherited classes.



Signed-off-by: Cristiano Urban <cristiano.urban@inaf.it>

parent 13f27d73

transfer_service/abort_job_amqp_server.py

+2 −1

Original line number	Diff line number	Diff line
		from amqp_server import AMQPServer

		from job_cache import JobCache

		class AbortJobAMQPServer(AMQPServer):

		def __init__(self, host, queue):
		self.type = "abort"
		self.jobCache = JobCache('redis', 6379, 0)
		super(AbortJobAMQPServer, self).__init__(host, queue)

		def execute_callback(self, requestBody):

transfer_service/amqp_server.py

+1 −5

Original line number	Diff line number	Diff line
		@@ -2,9 +2,6 @@ import pika
		import threading
		import json

		from job import Job
		from job_cache import JobCache


		class AMQPServer(threading.Thread):

		@@ -12,7 +9,6 @@ class AMQPServer(threading.Thread):
		threading.Thread.__init__(self)
		self.host = host
		self.queue = queue
		self.jobCache = JobCache('redis')
		self.connection = pika.BlockingConnection(pika.ConnectionParameters(host = self.host))
		self.channel = self.connection.channel();
		self.channel.queue_declare(queue = self.queue)

transfer_service/get_job_amqp_server.py

+2 −1

Original line number	Diff line number	Diff line
		from amqp_server import AMQPServer

		from job_cache import JobCache

		class GetJobAMQPServer(AMQPServer):

		def __init__(self, host, queue):
		self.type = "poll"
		self.jobCache = JobCache('redis', 6379, 0)
		super(GetJobAMQPServer, self).__init__(host, queue)

		def execute_callback(self, requestBody):

transfer_service/start_job_amqp_server.py

+3 −0

Original line number	Diff line number	Diff line
		@@ -3,11 +3,14 @@ import time # only for testing purposes

		from amqp_server import AMQPServer
		from job import Job
		from job_cache import JobCache


		class StartJobAMQPServer(AMQPServer):

		def __init__(self, host, queue):
		self.type = "start"
		self.jobCache = JobCache('redis', 6379, 0)
		super(StartJobAMQPServer, self).__init__(host, queue)

		def execute_callback(self, requestBody):

transfer_service/store_amqp_server.py

+1 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@ import json

		from amqp_server import AMQPServer
		from job import Job
		from job_cache import JobCache

		class StoreAMQPServer(AMQPServer):