x
/
iotronic
Code Issues Proposed changes

Merge "Set access_policy for messaging's dispatcher"

This commit is contained in:
Zuul 2017-12-12 05:55:33 +00:00 committed by Gerrit Code Review
parent 7cf5f4de23 37556080ed
commit e85b1cadb3
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
iotronic/common/rpc.py
View File

@ -15,6 +15,7 @@
from oslo_config import cfg
import oslo_messaging as messaging
from oslo_messaging.rpc import dispatcher
from oslo_serialization import jsonutils
from iotronic.common import context as iotronic_context
@ -133,12 +134,14 @@ def get_client(target, version_cap=None, serializer=None):
def get_server(target, endpoints, serializer=None):
assert TRANSPORT is not None
access_policy = dispatcher.DefaultRPCAccessPolicy
serializer = RequestContextSerializer(serializer)
return messaging.get_rpc_server(TRANSPORT,
target,
endpoints,
executor='eventlet',
serializer=serializer)
serializer=serializer,
access_policy=access_policy)
def get_notifier(service=None, host=None, publisher_id=None):

10
iotronic/conductor/manager.py
View File

@ -21,6 +21,7 @@ import os
from oslo_config import cfg
from oslo_log import log as logging
import oslo_messaging
from oslo_messaging.rpc import dispatcher
import signal
import time
@ -85,10 +86,11 @@ class ConductorManager(object):
endpoints = [
endp.ConductorEndpoint(ragent),
]
self.server = oslo_messaging.get_rpc_server(transport,
target,
endpoints,
executor='threading')
access_policy = dispatcher.DefaultRPCAccessPolicy
self.server = oslo_messaging.get_rpc_server(
transport, target,
endpoints, executor='threading',
access_policy=access_policy)
self.server.start()

10
iotronic/wamp/agent.py
View File

@ -25,6 +25,7 @@ from iotronic.db import api as dbapi
from oslo_config import cfg
from oslo_log import log as logging
import oslo_messaging
from oslo_messaging.rpc import dispatcher
import threading
from threading import Thread
from twisted.internet.protocol import ReconnectingClientFactory
@ -172,10 +173,11 @@ class RPCServer(Thread):
target = oslo_messaging.Target(topic=AGENT_HOST + '.s4t_invoke_wamp',
server='server1')
self.server = oslo_messaging.get_rpc_server(transport,
target,
endpoints,
executor='threading')
access_policy = dispatcher.DefaultRPCAccessPolicy
self.server = oslo_messaging.get_rpc_server(
transport, target,
endpoints, executor='threading',
access_policy=access_policy)
def run(self):
LOG.info("Starting AMQP server... ")

2
requirements.txt
View File

@ -16,4 +16,4 @@ pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2,>=1.0.0 # BSD
keystonemiddleware!=4.5.0,>=4.2.0 # Apache-2.0
autobahn>=0.10.1 # MIT License
#Twisted>=16.5.0 # MIT
WSME>=0.8 # MIT
WSME>=0.8 # MIT