fix: allow specify custom port in the rabbitmq config

5G-ERA · Apr 5, 2024 · 134d826 · 134d826
1 parent 72e2526
commit 134d826
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 8 deletions.
diff --git a/src/Common/Config/RabbitMqConfig.cs b/src/Common/Config/RabbitMqConfig.cs
@@ -10,6 +10,11 @@ public class RabbitMqConfig
     /// RabbitMQ broker address
     /// </summary>
     public string Address { get; set; }
+
+    /// <summary>
+    /// Password
+    /// </summary>
+    public ushort? Port { get; set; }
     /// <summary>
     /// User
     /// </summary>

diff --git a/src/OcelotGateway/ExtensionMethods/ServiceCollectionExtensions.cs b/src/OcelotGateway/ExtensionMethods/ServiceCollectionExtensions.cs
@@ -25,7 +25,8 @@ public static IServiceCollection RegisterRabbitMqConsumers(this IServiceCollecti
 
             x.UsingRabbitMq((busRegistrationContext, mqBusFactoryConfigurator) =>
             {
-                mqBusFactoryConfigurator.Host(mqConfig.Address, "/", hostConfig =>
+                var port = mqConfig.Port ?? 5672;
+                mqBusFactoryConfigurator.Host(mqConfig.Address, port , "/", hostConfig =>
                 {
                     hostConfig.Username(mqConfig.User);
                     hostConfig.Password(mqConfig.Pass);

diff --git a/src/OcelotGateway/appsettings.json b/src/OcelotGateway/appsettings.json
@@ -6,7 +6,8 @@
   "RabbitMQ": {
     "Address": "",
     "User": "",
-    "Pass": ""
+    "Pass": "",
+    "Port": ""
   },
   "Middleware": {
     "Organization": "",

diff --git a/src/Orchestrator/ExtensionMethods/ServiceCollectionExtensions.cs b/src/Orchestrator/ExtensionMethods/ServiceCollectionExtensions.cs
@@ -31,7 +31,8 @@ public static IServiceCollection RegisterRabbitMqConsumers(this IServiceCollecti
 
             x.UsingRabbitMq((busRegistrationContext, mqBusFactoryConfigurator) =>
             {
-                mqBusFactoryConfigurator.Host(mqConfig.Address, "/", hostConfig =>
+                var port  = mqConfig.Port ?? 5672;
+                mqBusFactoryConfigurator.Host(mqConfig.Address, port, "/", hostConfig =>
                 {
                     hostConfig.Username(mqConfig.User);
                     hostConfig.Password(mqConfig.Pass);

diff --git a/src/Orchestrator/appsettings.json b/src/Orchestrator/appsettings.json
@@ -9,7 +9,8 @@
   "RabbitMQ": {
     "Address": "",
     "User": "",
-    "Pass": ""
+    "Pass": "",
+    "Port": ""
   },
   "Redis": {
     "HostName": "Redis__HostName",

diff --git a/src/ResourcePlanner/ExtensionMethods/ServiceCollectionExtensions.cs b/src/ResourcePlanner/ExtensionMethods/ServiceCollectionExtensions.cs
@@ -20,7 +20,8 @@ public static IServiceCollection RegisterRabbitMqConsumers(this IServiceCollecti
 
             x.UsingRabbitMq((busRegistrationContext, mqBusFactoryConfigurator) =>
             {
-                mqBusFactoryConfigurator.Host(mqConfig.Address, "/", hostConfig =>
+                var port = mqConfig.Port ?? 5672;
+                mqBusFactoryConfigurator.Host(mqConfig.Address, port, "/", hostConfig =>
                 {
                     hostConfig.Username(mqConfig.User);
                     hostConfig.Password(mqConfig.Pass);

diff --git a/src/ResourcePlanner/appsettings.json b/src/ResourcePlanner/appsettings.json
@@ -2,7 +2,8 @@
   "RabbitMQ": {
     "Address": "",
     "User": "",
-    "Pass": ""
+    "Pass": "",
+    "Port": ""
   },
   "Slice": {
     "Hostname": ""

diff --git a/src/TaskPlanner/ExtensionMethods/ServiceCollectionExtensions.cs b/src/TaskPlanner/ExtensionMethods/ServiceCollectionExtensions.cs
@@ -15,7 +15,8 @@ public static IServiceCollection RegisterRabbitMqPublishers(this IServiceCollect
         {
             x.UsingRabbitMq((busRegistrationContext, mqBusFactoryConfigurator) =>
             {
-                mqBusFactoryConfigurator.Host(mqConfig.Address, "/", hostConfig =>
+                var port = mqConfig.Port ?? 5672;
+                mqBusFactoryConfigurator.Host(mqConfig.Address, port, "/", hostConfig =>
                 {
                     hostConfig.Username(mqConfig.User);
                     hostConfig.Password(mqConfig.Pass);

diff --git a/src/TaskPlanner/appsettings.json b/src/TaskPlanner/appsettings.json
@@ -2,7 +2,8 @@
   "RabbitMQ": {
     "Address": "",
     "User": "",
-    "Pass": ""
+    "Pass": "",
+    "Port": ""
   },
   "Redis": {
     "HostName": "",