Now passing exceptions into FleckLog calls

joeyespo · Mar 4, 2011 · f47e9ba · f47e9ba
1 parent 276b74e
commit f47e9ba
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 12 deletions.
diff --git a/src/Fleck.Tests/Fleck.Tests.csproj b/src/Fleck.Tests/Fleck.Tests.csproj
@@ -43,7 +43,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Class1.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/src/Fleck/FleckLog.cs b/src/Fleck/FleckLog.cs
@@ -22,22 +22,22 @@ public class FleckLog
 
 		public static void Warn(string message, Exception ex = null)
 		{
-			LogAction(LogLevel.Warn, message,ex);
+			LogAction(LogLevel.Warn, message, ex);
 		}
 
 		public static void Error(string message, Exception ex = null)
 		{
-			LogAction(LogLevel.Error, message,ex);
+			LogAction(LogLevel.Error, message, ex);
 		}
 
 		public static void Debug(string message, Exception ex = null)
 		{
-			LogAction(LogLevel.Debug, message,ex);
+			LogAction(LogLevel.Debug, message, ex);
 		}
 
 		public static void Info(string message, Exception ex = null)
 		{
-			LogAction(LogLevel.Info, message,ex);
+			LogAction(LogLevel.Info, message, ex);
 		}
 
 	}

diff --git a/src/Fleck/HandshakeHandler.cs b/src/Fleck/HandshakeHandler.cs
@@ -31,7 +31,7 @@ public void Shake(Socket socket)
 
 			Task<int>.Factory.FromAsync(socket.BeginReceive, socket.EndReceive, new[] {segment}, SocketFlags.None, null)
 				.ContinueWith(t => DoShake(state, t.Result))
-				.ContinueWith(t => FleckLog.Error("Exception thrown from method Receive:\n" + t.Exception.Message),
+				.ContinueWith(t => FleckLog.Error("Failed to recieve handshake", t.Exception),
 				TaskContinuationOptions.OnlyOnFaulted);
 		}
 
@@ -135,7 +135,7 @@ private void BeginSendServerHandshake(ServerHandshake handshake, Socket socket)
 
 			Task<int>.Factory.FromAsync(socket.BeginSend, socket.EndSend, new[] {segment}, SocketFlags.None, null)
 				.ContinueWith(t => EndSendServerHandshake())
-				.ContinueWith(t => FleckLog.Error("Send handshake failed: " + t.Exception.Message), TaskContinuationOptions.OnlyOnFaulted);
+				.ContinueWith(t => FleckLog.Error("Send handshake failed", t.Exception), TaskContinuationOptions.OnlyOnFaulted);
 		}
 
 		private void EndSendServerHandshake()

diff --git a/src/Fleck/Receiver.cs b/src/Fleck/Receiver.cs
@@ -64,8 +64,7 @@ public void Receive(DataFrame frame = null)
 					}, TaskContinuationOptions.NotOnFaulted)
 				.ContinueWith(t =>
 					{
-						if (t.Exception == null) return;
-						FleckLog.Error(t.Exception.Message);
+						FleckLog.Error("Recieve failed", t.Exception);
 						_connection.Close();
 					}, TaskContinuationOptions.OnlyOnFaulted);
 		}

diff --git a/src/Fleck/Sender.cs b/src/Fleck/Sender.cs
@@ -24,8 +24,7 @@ public void Send(string data)
 			Task<int>.Factory.FromAsync(Socket.BeginSend, Socket.EndSend, new[] {segment}, SocketFlags.None, null)
 				.ContinueWith(t =>
 					{
-						if (t.Exception == null) return;
-						FleckLog.Error(t.Exception.Message);
+						FleckLog.Error("Send failed", t.Exception);
 						_connection.Close();
 					}, TaskContinuationOptions.OnlyOnFaulted);
 		}

diff --git a/src/Fleck/WebSocketServer.cs b/src/Fleck/WebSocketServer.cs
@@ -52,7 +52,7 @@ private void ListenForClients()
 		{
 			Task<Socket>.Factory.FromAsync(ListenerSocket.BeginAccept, ListenerSocket.EndAccept, null)
 				.ContinueWith(OnClientConnect)
-				.ContinueWith(t => FleckLog.Error("Listener socket is closed"), TaskContinuationOptions.OnlyOnFaulted);
+				.ContinueWith(t => FleckLog.Error("Listener socket is closed", t.Exception), TaskContinuationOptions.OnlyOnFaulted);
 		}
 
 		private void OnClientConnect(Task<Socket> task)