Merge branch 'develop' into release/v1.4.0

SMI · Feb 14, 2020 · 2fa84d4 · 2fa84d4
2 parents 09487d0 + 9270c4f
commit 2fa84d4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/common/Smi.Common/Execution/MicroserviceHost.cs b/src/common/Smi.Common/Execution/MicroserviceHost.cs
@@ -111,7 +111,10 @@ protected MicroserviceHost(GlobalOptions globals, bool loadSmiLogConfig = true)
             //    throw new ArgumentException("Could not locate the FileSystemRoot \"" + options.FileSystemRoot + "\"");
 
             OnFatal += (sender, args) => Fatal(args.Message, args.Exception);
-            RabbitMqAdapter = new RabbitMqAdapter(globals.RabbitOptions, HostProcessName + HostProcessID, OnFatal);
+
+            // TODO(rkm 2020-02-14) This is only a temporary fix
+            bool threaded = (HostProcessName == "IdentifierMapper");
+            RabbitMqAdapter = new RabbitMqAdapter(globals.RabbitOptions, HostProcessName + HostProcessID, OnFatal, threaded);
 
             _controlMessageConsumer = new ControlMessageConsumer(this, globals.RabbitOptions, HostProcessName, HostProcessID);
 

diff --git a/src/common/Smi.Common/RabbitMQAdapter.cs b/src/common/Smi.Common/RabbitMQAdapter.cs
@@ -56,18 +56,21 @@ public bool HasConsumers
 
         private const int MaxSubscriptionAttempts = 5;
 
-        private bool threaded;
+        private readonly bool _threaded;
 
         /// <summary>
         /// 
         /// </summary>
         /// <param name="options">Connection parameters to a RabbitMQ server</param>
         /// <param name="hostId">Identifier for this host instance</param>
         /// <param name="hostFatalHandler"></param>
-        public RabbitMqAdapter(RabbitOptions options, string hostId, HostFatalHandler hostFatalHandler = null)
+        /// <param name="threaded"></param>
+        public RabbitMqAdapter(RabbitOptions options, string hostId, HostFatalHandler hostFatalHandler = null, bool threaded = false)
         {
-            threaded = options.ThreadReceivers;
-            if (threaded)
+            //_threaded = options.ThreadReceivers;
+            _threaded = threaded;
+
+            if (_threaded)
             {
                 int minWorker, minIOC;
                 ThreadPool.GetMinThreads(out minWorker, out minIOC);
@@ -399,7 +402,7 @@ private void Consume(ISubscription subscription, IConsumer consumer, Cancellatio
 
                 if (subscription.Next(500, out e))
                 {
-                    if (threaded)
+                    if (_threaded)
                         Task.Run(() => consumer.ProcessMessage(e));
                     else
                         consumer.ProcessMessage(e);