1 files changed, 12 insertions, 25 deletions

diff --git a/moonv4/moon_authz/moon_authz/messenger.py b/moonv4/moon_authz/moon_authz/messenger.py
index 8ebd1633..6fa34770 100644
--- a/moonv4/moon_authz/moon_authz/messenger.py
+++ b/moonv4/moon_authz/moon_authz/messenger.py
@@ -5,12 +5,10 @@
 
 from oslo_config import cfg
 import oslo_messaging
-import hashlib
 import time
 from oslo_log import log as logging
 from moon_authz.api.generic import Status, Logs
 from moon_authz.api.authorization import Authorization
-from moon_utilities.security_functions import call
 from moon_utilities.api import APIList
 
 LOG = logging.getLogger(__name__)
@@ -20,44 +18,33 @@ CONF = cfg.CONF
 class Server:
 
     def __init__(self, component_id, keystone_project_id):
-        self.TOPIC = "authz_"+hashlib.sha224(component_id.encode("utf-8")).hexdigest()
-        self.transport = oslo_messaging.get_transport(cfg.CONF)
-        self.target = oslo_messaging.Target(topic=self.TOPIC, server='moon_authz_server1')
-        # ctx = {'user_id': 'admin', 'id': component_id, 'method': 'get_intra_extensions'}
-        # if CONF.slave.slave_name:
-        #     ctx['call_master'] = True
-        # intra_extension = call(
-        #     endpoint="security_router",
-        #     ctx=ctx,
-        #     method='route',
-        #     args={}
-        # )
-        # if "intra_extensions" not in intra_extension:
-        #     LOG.error("Error reading intra_extension from router")
-        #     LOG.error("intra_extension: {}".format(intra_extension))
-        #     raise IntraExtensionUnknown
-        # component_id = list(intra_extension["intra_extensions"].keys())[0]
-        LOG.info("Starting MQ server with topic: {}".format(self.TOPIC))
+        self.TOPIC = "authz-workers"
+        transport = oslo_messaging.get_notification_transport(cfg.CONF)
+        targets = [
+            oslo_messaging.Target(topic=self.TOPIC),
+        ]
         self.endpoints = [
             APIList((Status, Logs)),
             Status(),
             Logs(),
             Authorization(component_id)
         ]
-        self.server = oslo_messaging.get_rpc_server(self.transport, self.target, self.endpoints,
-                                                    executor='threading',
-                                                    access_policy=oslo_messaging.DefaultRPCAccessPolicy)
+        pool = "authz-workers"
+        self.server = oslo_messaging.get_notification_listener(transport, targets,
+                                                               self.endpoints, executor='threading',
+                                                               pool=pool)
+        LOG.info("Starting MQ notification server with topic: {}".format(self.TOPIC))
 
     def run(self):
         try:
             self.server.start()
             while True:
-                time.sleep(1)
+                time.sleep(0.1)
         except KeyboardInterrupt:
             print("Stopping server by crtl+c")
         except SystemExit:
             print("Stopping server")
 
         self.server.stop()
-        self.server.wait()
+