Merge lp:~thomir-deactivatedaccount/core-result-checker/trunk-add-worker into lp:core-result-checker

[Thomi Richards]

Basic implementation for the result-checker.

Basic implementation for the result-checker.

[lp:~thomir-deactivatedaccount/core-result-checker/trunk-add-worker]

13. By Thomi Richards on 2015-04-06

Check success of swift post operation, and log error as appropriate.

[Celso Providelo (cprov)]

Thomi,

Very cool, let's see it in action.

[]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2015-03-25 04:59:12 +0000
+++ .bzrignore	2015-04-06 23:23:40 +0000
@@ -1,1 +1,2 @@
 core_result_checker.egg-info
+secret.conf

=== added file 'core-service.conf'
--- core-service.conf	1970-01-01 00:00:00 +0000
+++ core-service.conf	2015-04-06 23:23:40 +0000
@@ -0,0 +1,8 @@
+[amqp]
+uris = amqp://guest:guest@localhost:5672//
+
+[nova]
+os_username = foo
+os_password = <redacted>
+os_tenant_name = foo_project
+os_auth_url = http://172.20.161.138:5000/v2.0/
\ No newline at end of file

=== modified file 'core_result_checker/__init__.py'
--- core_result_checker/__init__.py	2015-04-03 01:43:12 +0000
+++ core_result_checker/__init__.py	2015-04-06 23:23:40 +0000
@@ -19,14 +19,65 @@
 import configparser
 import logging
 import os
-import select
 
-from uservice_utils.logging import configure_service_logging
+import kombu
+from swiftclient.service import SwiftService
+from uservice_utils.logging import (
+    configure_service_logging,
+    ExtraLogger,
+)
+from uservice_utils.queue import (
+    DefaultRetryPolicy,
+    MessageActions,
+    SimpleRabbitQueueWorker,
+)
 
 from core_result_checker import constants
 
 
-logger = logging.getLogger(__name__)
+class Worker(object):
+
+    def __init__(self, swift_publisher):
+        get_logger(__name__).info("Service Started.")
+        self.swift_publisher = swift_publisher
+
+    def __call__(self, message):
+        logger = get_logger(__name__, message)
+        logger.info("Got: %r", message)
+        try:
+            channel = message['channel']
+            device = message['device']
+            image_name = message['image_name']
+        except KeyError as e:
+            logger.error("Unable to unpack incoming message: %s", str(e))
+            return MessageActions.Retry
+
+        container_name = "core-{}-{}-{}".format(
+            channel,
+            device,
+            image_name,
+        )
+        try:
+            self.swift_publisher.make_container_public(container_name)
+        except RuntimeError as e:
+            logger.error(
+                "Unable to publish swift container '%s'. Error: %s.",
+                container_name,
+                e
+            )
+            return MessageActions.Retry
+        logger.info("Swift container made public OK.")
+        return MessageActions.Acknowledge
+
+
+def get_logger(name, extra={}):
+    if logging.getLoggerClass() != ExtraLogger:
+        logging.setLoggerClass(ExtraLogger)
+    logger = logging.getLogger(name)
+    e = constants.LOGGING_EXTRA.copy()
+    e.update(extra)
+    logger.set_extra_args(e)
+    return logger
 
 
 def read_config():
@@ -45,6 +96,33 @@
     return config
 
 
+class SwiftPublisher(object):
+
+    """A class that knows how to make a swift container public."""
+
+    def __init__(self, nova_config):
+        self.config = nova_config
+
+    def make_container_public(self, container_name):
+        """Make a swift contianer public.
+
+        Raises RuntimeError on failure, returns None otherwise.
+
+        """
+        swift = SwiftService(self.config)
+        result = swift.post(
+            container=container_name,
+            options=dict(read_acl='.r:*')
+        )
+        if not result['success']:
+            raise RuntimeError(
+                "Unable to make swift container '%s' public: %s" % (
+                    container_name,
+                    result['error']
+                )
+            )
+
+
 def main():
     config = read_config()
     log_path = os.path.abspath(
@@ -54,7 +132,21 @@
         config['logstash'] if 'logstash' in config else None
     )
 
-    logger.info('Started!', extra=constants.LOGGING_EXTRA)
-
-    # for now, do nothing at all.
-    select.select([], [], [])
+    amqp_uris = config.get('amqp', 'uris').split()
+    swift_publisher = SwiftPublisher(config['nova'])
+    worker = Worker(swift_publisher)
+    retry_policy = DefaultRetryPolicy(
+        max_retries=3,
+        dead_queue='core.deadletters.{}'.format(constants.API_VERSION)
+    )
+    try:
+        with kombu.Connection(amqp_uris) as connection:
+            queue_monitor = SimpleRabbitQueueWorker(
+                connection,
+                "core.result.{}".format(constants.API_VERSION),
+                worker,
+                retry_policy,
+            )
+            queue_monitor.run()
+    except KeyboardInterrupt:
+        print("Bye")

=== modified file 'requirements.txt'
--- requirements.txt	2015-04-03 01:41:47 +0000
+++ requirements.txt	2015-04-06 23:23:40 +0000
@@ -1,3 +1,5 @@
 kombu==3.0.24
+python-keystoneclient==1.3.0
 python-logstash==0.4.2
-uservice-utils==1.0.2.1
+python-swiftclient==2.4.0
+uservice-utils==1.0.2.1
\ No newline at end of file