Refactored DefaultMessageBus.

* Replaced private GetHostName with IHostNameProvider.
This commit is contained in:
Sipke Schoorstra
2015-09-16 23:18:19 +01:00
parent b011594be6
commit 951391f4dd

View File

@@ -1,15 +1,15 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Web;
using System.Threading.Tasks;
using Orchard.Logging; using Orchard.Logging;
namespace Orchard.MessageBus.Services { namespace Orchard.MessageBus.Services {
public class DefaultMessageBus : IMessageBus { public class DefaultMessageBus : IMessageBus {
private readonly IMessageBroker _messageBroker; private readonly IMessageBroker _messageBroker;
private readonly IHostNameProvider _hostNameProvider;
public DefaultMessageBus(IEnumerable<IMessageBroker> messageBrokers) { public DefaultMessageBus(IEnumerable<IMessageBroker> messageBrokers, IHostNameProvider hostNameProvider) {
_hostNameProvider = hostNameProvider;
_messageBroker = messageBrokers.FirstOrDefault(); _messageBroker = messageBrokers.FirstOrDefault();
Logger = NullLogger.Instance; Logger = NullLogger.Instance;
@@ -23,7 +23,7 @@ namespace Orchard.MessageBus.Services {
} }
_messageBroker.Subscribe(channel, handler); _messageBroker.Subscribe(channel, handler);
Logger.Debug("{0} subscribed to {1}", GetHostName(), channel); Logger.Debug("{0} subscribed to {1}", _hostNameProvider.GetHostName(), channel);
} }
public void Publish(string channel, string message) { public void Publish(string channel, string message) {
@@ -32,12 +32,7 @@ namespace Orchard.MessageBus.Services {
} }
_messageBroker.Publish(channel, message); _messageBroker.Publish(channel, message);
Logger.Debug("{0} published {1}", GetHostName(), channel); Logger.Debug("{0} published {1}", _hostNameProvider.GetHostName(), channel);
}
private string GetHostName() {
// use the current host and the process id as two servers could run on the same machine
return System.Net.Dns.GetHostName() + ":" + System.Diagnostics.Process.GetCurrentProcess().Id;
} }
} }
} }