Merge branch 'release/1.1.1'

Tapeti.Serilog/TapetiSeriLogger.cs

@@ -1,8 +1,6 @@
 using System;
 using ISeriLogger = Serilog.ILogger;
 
-// ReSharper disable UnusedMember.Global
-
 namespace Tapeti.Serilog
 {
     public class TapetiSeriLogger: ILogger
@@ -16,26 +14,31 @@ namespace Tapeti.Serilog
 
         public void Connect(TapetiConnectionParams connectionParams)
         {
-            // method not yet used in Tapeti
+            seriLogger.Information("Tapeti: trying to connect to {host}:{port}/{virtualHost}", 
-            seriLogger.Information("Trying to connected to " + connectionParams.HostName);
+                connectionParams.HostName,
+                connectionParams.Port,
+                connectionParams.VirtualHost);
         }
 
-        public void ConnectFailed(TapetiConnectionParams connectionParams)
+        public void ConnectFailed(TapetiConnectionParams connectionParams, Exception exception)
         {
-            // method not yet used in Tapeti
+            seriLogger.Error(exception, "Tapeti: could not connect to {host}:{port}/{virtualHost}", 
-            seriLogger.Error("Could not connect to " + connectionParams.HostName);
+                connectionParams.HostName,
-
+                connectionParams.Port,
+                connectionParams.VirtualHost);
         }
 
         public void ConnectSuccess(TapetiConnectionParams connectionParams)
         {
-            // method not yet used in Tapeti
+            seriLogger.Information("Tapeti: successfully connected to {host}:{port}/{virtualHost}", 
-            seriLogger.Information("Succesfull connected to " + connectionParams.HostName);
+                connectionParams.HostName,
+                connectionParams.Port,
+                connectionParams.VirtualHost);
         }
         
         public void HandlerException(Exception e)
         {
-            seriLogger.Error(e, "Exception handled by Tapeti");
+            seriLogger.Error(e, "Tapeti: exception in message handler");
         }
     }
 }

Tapeti/Connection/TapetiWorker.cs

@@ -16,6 +16,7 @@ namespace Tapeti.Connection
         private const int PublishMaxConnectAttempts = 3;
 
         private readonly IConfig config;
+        private readonly ILogger logger;
         public TapetiConnectionParams ConnectionParams { get; set; }
         public IConnectionEventListener ConnectionEventListener { get; set; }
 
@@ -31,6 +32,7 @@ namespace Tapeti.Connection
         {
             this.config = config;
 
+            logger = config.DependencyResolver.Resolve<ILogger>();
             messageSerializer = config.DependencyResolver.Resolve<IMessageSerializer>();
             routingKeyStrategy = config.DependencyResolver.Resolve<IRoutingKeyStrategy>();
             exchangeStrategy = config.DependencyResolver.Resolve<IExchangeStrategy>();
@@ -201,6 +203,8 @@ namespace Tapeti.Connection
             {
                 try
                 {
+                    logger.Connect(ConnectionParams);
+
                     connection = connectionFactory.CreateConnection();
                     channelInstance = connection.CreateModel();
 
@@ -212,10 +216,14 @@ namespace Tapeti.Connection
                     channelInstance.ModelShutdown += (sender, e) => ConnectionEventListener?.Disconnected();
 
                     ConnectionEventListener?.Connected();
+                    logger.ConnectSuccess(ConnectionParams);
+
                     break;
                 }
-                catch (BrokerUnreachableException)
+                catch (BrokerUnreachableException e)
                 {
+                    logger.ConnectFailed(ConnectionParams, e);
+
                     attempts++;
                     if (maxAttempts.HasValue && attempts > maxAttempts.Value)
                         throw;

Tapeti/Default/ConsoleLogger.cs

@@ -6,17 +6,17 @@ namespace Tapeti.Default
     {
         public void Connect(TapetiConnectionParams connectionParams)
         {
-            throw new NotImplementedException();
+            Console.WriteLine($"[Tapeti] Connecting to {connectionParams.HostName}:{connectionParams.Port}{connectionParams.VirtualHost}");
         }
 
-        public void ConnectFailed(TapetiConnectionParams connectionParams)
+        public void ConnectFailed(TapetiConnectionParams connectionParams, Exception exception)
         {
-            throw new NotImplementedException();
+            Console.WriteLine($"[Tapeti] Connection failed: {exception}");
         }
 
         public void ConnectSuccess(TapetiConnectionParams connectionParams)
         {
-            throw new NotImplementedException();
+            Console.WriteLine($"[Tapeti] Connected");
         }
 
         public void HandlerException(Exception e)

Tapeti/Default/DevNullLogger.cs

@@ -8,7 +8,7 @@ namespace Tapeti.Default
         {
         }
 
-        public void ConnectFailed(TapetiConnectionParams connectionParams)
+        public void ConnectFailed(TapetiConnectionParams connectionParams, Exception exception)
         {
         }
 

Tapeti/ILogger.cs

@@ -9,7 +9,7 @@ namespace Tapeti
     public interface ILogger
     {
         void Connect(TapetiConnectionParams connectionParams);
-        void ConnectFailed(TapetiConnectionParams connectionParams);
+        void ConnectFailed(TapetiConnectionParams connectionParams, Exception exception);
         void ConnectSuccess(TapetiConnectionParams connectionParams);
         void HandlerException(Exception e);
     }

Test/App.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <appSettings>
+    <add key="rabbitmq:hostname" value="localhost" />
+  </appSettings>
+</configuration>

Test/MyLogger.cs

@@ -1,25 +1,20 @@
 using System;
 using Tapeti;
 
-// ReSharper disable UnusedMember.Global
-
 namespace Test
 {
     public class MyLogger : ILogger
     {
         public void Connect(TapetiConnectionParams connectionParams)
         {
-            throw new NotImplementedException();
         }
 
-        public void ConnectFailed(TapetiConnectionParams connectionParams)
+        public void ConnectFailed(TapetiConnectionParams connectionParams, Exception exception)
         {
-            throw new NotImplementedException();
         }
 
         public void ConnectSuccess(TapetiConnectionParams connectionParams)
         {
-            throw new NotImplementedException();
         }
 
         public void HandlerException(Exception e)