250501 커밋

ServerBase/MessageQueue/RabbitMqConnector.cs

@@ -28,7 +28,7 @@ namespace ServerBase;
 public abstract partial class RabbitMqConnector : RabbitMQConnectorBase, IRabbitMqSession, IModule, IWithPacketNamespaceVerifier
 {
     public delegate Task FnServerMessageRecvFromConsumer(BasicDeliverEventArgs ea, IMessage message);
-	public FnServerMessageRecvFromConsumer? _fnServerMessageRecvFromConsumer;
+	public FnServerMessageRecvFromConsumer? m_fn_server_message_recv_from_consumer;
 
     private readonly PacketReceiver m_packet_receiver;
 
@@ -66,7 +66,7 @@ public abstract partial class RabbitMqConnector : RabbitMQConnectorBase, IRabbit
     {
         var packet_namespace = ".PacketHandler";
 
-        if (null != toCheckNamespace
+        if (   null != toCheckNamespace
             && true == toCheckNamespace.Contains(packet_namespace))
         {
             return true;
@@ -132,14 +132,14 @@ public abstract partial class RabbitMqConnector : RabbitMQConnectorBase, IRabbit
 			Log.getLogger().error("rabbitMq registerRecvHandler error");
 			return result;
 		}
-			
-        _fnServerMessageRecvFromConsumer = fnFromConsumer;
+
+        m_fn_server_message_recv_from_consumer = fnFromConsumer;
 
 		return base.startConsumer();
 	}
 
     public async Task<bool> onRecvProtocol<T>(BasicDeliverEventArgs ea, T recvProtocol)
-           where T : Google.Protobuf.IMessage
+        where T : Google.Protobuf.IMessage
     {
         Log.getLogger().info($"receive:{recvProtocol.ToString()} - {toBasicString()}");
 
@@ -227,13 +227,13 @@ public abstract partial class RabbitMqConnector : RabbitMQConnectorBase, IRabbit
 			return;
 		}
 			
-		if(_fnServerMessageRecvFromConsumer == null)
+		if(m_fn_server_message_recv_from_consumer == null)
 		{
 			Log.getLogger().error("_fnServerMessageRecvFromConsumer is null");
 			return;
 		}
 
-        await _fnServerMessageRecvFromConsumer.Invoke(ea, message);
+        await m_fn_server_message_recv_from_consumer.Invoke(ea, message);
 	}
 
     protected override void onRecvProtoMessageFromConsumer(object? sender, BasicDeliverEventArgs ea)
@@ -241,19 +241,19 @@ public abstract partial class RabbitMqConnector : RabbitMQConnectorBase, IRabbit
     }
 
     protected virtual bool onCheckByExchangeType<T>(BasicDeliverEventArgs ea, T recvProtocol)
-           where T : Google.Protobuf.IMessage
+        where T : Google.Protobuf.IMessage
     {
         return true;
     }
 
     public Task<object>? SendKick( string destServer, string name, Int32 delayMS
 			                         , Action<Task<object>>? callback )
-		{
-			int reqId = nextReqId();
+	{
+		int reqId = nextReqId();
         Task<object>? waitTask = null;
 
         if (callback != null)
-			{
+	    {
             CancellationTokenSource cancelTokenSrc = new CancellationTokenSource(delayMS);
 
             waitTask = registerCompletionSource(reqId, cancelTokenSrc.Token, callback);
@@ -271,18 +271,19 @@ public abstract partial class RabbitMqConnector : RabbitMQConnectorBase, IRabbit
         SendMessage(destServer, message);
 
         return waitTask;
-		}
+	}
 
-		public void SendMessage(string to, ServerMessage message)
+	public void SendMessage(string to, ServerMessage message)
+	{
+		var con = getConnection();
+		if(null == con)
 		{
-			IConnection? con = getConnection();
-			if(con == null)
-			{
             Log.getLogger().error("GetConnection return null");
-				return;	
-			}
-			using (var channel = con.CreateModel())
-			{
+			return;	
+		}
+	
+        using (var channel = con.CreateModel())
+		{
             Stopwatch? stopwatch = null;
             var event_tid = string.Empty;
 
@@ -301,16 +302,16 @@ public abstract partial class RabbitMqConnector : RabbitMQConnectorBase, IRabbit
 				                      autoDelete: true,
 				                      arguments: null );
 
-				message.MessageTime = Google.Protobuf.WellKnownTypes.Timestamp.FromDateTime(DateTime.UtcNow);
-				message.MessageSender = getServiceName();
+			message.MessageTime = Google.Protobuf.WellKnownTypes.Timestamp.FromDateTime(DateTime.UtcNow);
+			message.MessageSender = getServiceName();
 
-				string messageJson = JsonFormatter.Default.Format(message);
-				var body = Encoding.UTF8.GetBytes(messageJson);
+			string messageJson = JsonFormatter.Default.Format(message);
+			var body = Encoding.UTF8.GetBytes(messageJson);
 
-				channel.BasicPublish( exchange: "",
-									  routingKey: to,
-									  basicProperties: null,
-									  body: body );
+			channel.BasicPublish( exchange: "",
+								  routingKey: to,
+								  basicProperties: null,
+								  body: body );
 
             Log.getLogger().info($"send to MQS !!!, msg:{messageJson} - receiver:{to}");