apunkt/trustgraph
1
0
Fork 0
mirror of https://github.com/trustgraph-ai/trustgraph.git synced 2026-07-23 20:21:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix gateway/rev-gateway duplicate naming

Browse source
This commit is contained in:
Cyber MacGeddon 2025-06-24 10:12:32 +01:00
parent 5f0eb2bca5
commit 7d3d50f188
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
trustgraph-flow/trustgraph/gateway/dispatch/manager.py
View file

@ -81,10 +81,11 @@ class DispatcherWrapper:
class DispatcherManager: class DispatcherManager:
def __init__(self, pulsar_client, config_receiver): def __init__(self, pulsar_client, config_receiver, prefix="api-gateway"):
self.pulsar_client = pulsar_client self.pulsar_client = pulsar_client
self.config_receiver = config_receiver self.config_receiver = config_receiver
self.config_receiver.add_handler(self) self.config_receiver.add_handler(self)
self.prefix = prefix
self.flows = {} self.flows = {}
self.dispatchers = {} self.dispatchers = {}
@ -133,8 +134,8 @@ class DispatcherManager:
dispatcher = global_dispatchers[kind]( dispatcher = global_dispatchers[kind](
pulsar_client = self.pulsar_client, pulsar_client = self.pulsar_client,
timeout = 120, timeout = 120,
consumer = f"api-gateway-{kind}-request", consumer = f"{self.prefix}-{kind}-request",
subscriber = f"api-gateway-{kind}-request", subscriber = f"{self.prefix}-{kind}-request",
) )
await dispatcher.start() await dispatcher.start()
@ -226,8 +227,8 @@ class DispatcherManager:
ws = ws, ws = ws,
running = running, running = running,
queue = qconfig, queue = qconfig,
consumer = f"api-gateway-{id}", consumer = f"{self.prefix}-{id}",
subscriber = f"api-gateway-{id}", subscriber = f"{self.prefix}-{id}",
) )
return dispatcher return dispatcher
@ -268,8 +269,8 @@ class DispatcherManager:
request_queue = qconfig["request"], request_queue = qconfig["request"],
response_queue = qconfig["response"], response_queue = qconfig["response"],
timeout = 120, timeout = 120,
consumer = f"api-gateway-{flow}-{kind}-request", consumer = f"{self.prefix}-{flow}-{kind}-request",
subscriber = f"api-gateway-{flow}-{kind}-request", subscriber = f"{self.prefix}-{flow}-{kind}-request",
) )
elif kind in sender_dispatchers: elif kind in sender_dispatchers:
dispatcher = sender_dispatchers[kind]( dispatcher = sender_dispatchers[kind](

1
trustgraph-flow/trustgraph/gateway/service.py
View file

@ -73,6 +73,7 @@ class Api:
self.dispatcher_manager = DispatcherManager( self.dispatcher_manager = DispatcherManager(
pulsar_client = self.pulsar_client, pulsar_client = self.pulsar_client,
config_receiver = self.config_receiver, config_receiver = self.config_receiver,
prefix = "gateway",
) )
self.endpoint_manager = EndpointManager( self.endpoint_manager = EndpointManager(

2
trustgraph-flow/trustgraph/rev_gateway/dispatcher.py
View file

@ -35,7 +35,7 @@ class MessageDispatcher:
# Use DispatcherManager for flow and service management # Use DispatcherManager for flow and service management
if pulsar_client and config_receiver: if pulsar_client and config_receiver:
self.dispatcher_manager = DispatcherManager(pulsar_client, config_receiver) self.dispatcher_manager = DispatcherManager(pulsar_client, config_receiver, prefix="rev-gateway")
else: else:
self.dispatcher_manager = None self.dispatcher_manager = None
logger.warning("No pulsar_client or config_receiver provided - using fallback mode") logger.warning("No pulsar_client or config_receiver provided - using fallback mode")