diff --git a/Esiur/Core/AsyncReply.cs b/Esiur/Core/AsyncReply.cs index aad464e..bdc772a 100644 --- a/Esiur/Core/AsyncReply.cs +++ b/Esiur/Core/AsyncReply.cs @@ -66,9 +66,11 @@ public class AsyncReply public bool Ready { get { return resultReady; } - } + public bool Failed => exception != null; + + public Exception Exception => exception; public object Wait() { diff --git a/Esiur/Core/AsyncReplyBuilder.cs b/Esiur/Core/AsyncReplyBuilder.cs index 114da18..3f0c545 100644 --- a/Esiur/Core/AsyncReplyBuilder.cs +++ b/Esiur/Core/AsyncReplyBuilder.cs @@ -1,4 +1,5 @@ -using System; +using Esiur.Misc; +using System; using System.Collections.Generic; using System.Runtime.CompilerServices; using System.Text; @@ -27,7 +28,7 @@ public class AsyncReplyBuilder public void SetStateMachine(IAsyncStateMachine stateMachine) { - Console.WriteLine("SetStateMachine"); + Global.Log("AsyncReplyBuilder", LogType.Debug, "SetStateMachine"); } public void SetException(Exception exception) diff --git a/Esiur/Core/AsyncReplyBuilderGeneric.cs b/Esiur/Core/AsyncReplyBuilderGeneric.cs index 90be3e4..20b525f 100644 --- a/Esiur/Core/AsyncReplyBuilderGeneric.cs +++ b/Esiur/Core/AsyncReplyBuilderGeneric.cs @@ -1,4 +1,5 @@ -using System; +using Esiur.Misc; +using System; using System.Collections.Generic; using System.Runtime.CompilerServices; using System.Text; @@ -27,7 +28,7 @@ public class AsyncReplyBuilder public void SetStateMachine(IAsyncStateMachine stateMachine) { - Console.WriteLine("SetStateMachine"); + Global.Log("AsyncReplyBuilderGeneric", LogType.Debug, "SetStateMachine"); } public void SetException(Exception exception) diff --git a/Esiur/Data/DataDeserializer.cs b/Esiur/Data/DataDeserializer.cs index 11ff5a4..c0ece91 100644 --- a/Esiur/Data/DataDeserializer.cs +++ b/Esiur/Data/DataDeserializer.cs @@ -7,6 +7,7 @@ using System.Text; using Esiur.Data; using Esiur.Resource.Template; using System.Linq; +using Esiur.Misc; namespace Esiur.Data; @@ -182,7 +183,7 @@ public static class DataDeserializer } catch (Exception ex) { - Console.WriteLine(ex); + Global.Log(ex); } } diff --git a/Esiur/Esiur.csproj b/Esiur/Esiur.csproj index 3bfb087..5d2fd79 100644 --- a/Esiur/Esiur.csproj +++ b/Esiur/Esiur.csproj @@ -5,7 +5,7 @@ Ahmed Kh. Zamil http://www.esiur.com true - 2.4.2 + 2.4.3 https://github.com/esiur/esiur-dotnet Ahmed Kh. Zamil diff --git a/Esiur/Net/IIP/DistributedConnection.cs b/Esiur/Net/IIP/DistributedConnection.cs index 0f2a7e2..e240a94 100644 --- a/Esiur/Net/IIP/DistributedConnection.cs +++ b/Esiur/Net/IIP/DistributedConnection.cs @@ -1502,7 +1502,7 @@ public partial class DistributedConnection : NetworkConnection, IStore } catch (Exception ex) { - Console.WriteLine(ex); + Global.Log(ex); } finally { @@ -1654,7 +1654,7 @@ public partial class DistributedConnection : NetworkConnection, IStore var link = DC.ToBytes(r.DistributedResourceLink); - Console.WriteLine("Restoreing " + r.DistributedResourceLink); + Global.Log("DistributedConnection", LogType.Debug, "Restoreing " + r.DistributedResourceLink); try { @@ -1683,7 +1683,7 @@ public partial class DistributedConnection : NetworkConnection, IStore await Fetch(id, null); - Console.WriteLine("Restored " + id); + Global.Log("DistributedConnection", LogType.Debug, "Restored " + id); } } catch (AsyncException ex) diff --git a/Esiur/Net/IIP/DistributedConnectionProtocol.cs b/Esiur/Net/IIP/DistributedConnectionProtocol.cs index d68d931..01b6fb2 100644 --- a/Esiur/Net/IIP/DistributedConnectionProtocol.cs +++ b/Esiur/Net/IIP/DistributedConnectionProtocol.cs @@ -601,8 +601,9 @@ partial class DistributedConnection { // reply failed //SendParams(0x80, r.Instance.Id, r.Instance.Age, r.Instance.Serialize(false, this)); - Console.WriteLine("Not found " + resourceId); - + + Global.Log("DistributedConnection", LogType.Debug, "Not found " + resourceId); + SendError(ErrorType.Management, callback, (ushort)ExceptionCode.ResourceNotFound); } }); diff --git a/Esiur/Net/IIP/DistributedResource.cs b/Esiur/Net/IIP/DistributedResource.cs index b9faefc..7ca1a01 100644 --- a/Esiur/Net/IIP/DistributedResource.cs +++ b/Esiur/Net/IIP/DistributedResource.cs @@ -413,7 +413,7 @@ public class DistributedResource : DynamicObject, IResource, INotifyPropertyChan /// Indicator when the property is set. protected object _SetSync(byte index, object value) { - Console.WriteLine("Setting..." + index + " " + value); + //Console.WriteLine("Setting..." + index + " " + value); if (destroyed) throw new Exception("Trying to access a destroyed object."); @@ -433,7 +433,7 @@ public class DistributedResource : DynamicObject, IResource, INotifyPropertyChan var rt = _Set(index, value).Wait(); - Console.WriteLine("Done Setting"); + //Console.WriteLine("Done Setting"); return rt; } diff --git a/Esiur/Net/NetworkServer.cs b/Esiur/Net/NetworkServer.cs index 366c3a1..f873066 100644 --- a/Esiur/Net/NetworkServer.cs +++ b/Esiur/Net/NetworkServer.cs @@ -145,7 +145,7 @@ public abstract class NetworkServer : IDestructible where TConnecti } catch (Exception ex) { - Console.WriteLine(ex); + Global.Log(ex); } } })); @@ -210,7 +210,7 @@ public abstract class NetworkServer : IDestructible where TConnecti } finally { - Console.WriteLine("Server@{0} is down", port); + Global.Log("NetworkServer", LogType.Warning, $"Server@{port} is down."); } } diff --git a/Esiur/Net/Packets/WebSocket/WebsocketPacket.cs b/Esiur/Net/Packets/WebSocket/WebsocketPacket.cs index 677ef06..c2d7083 100644 --- a/Esiur/Net/Packets/WebSocket/WebsocketPacket.cs +++ b/Esiur/Net/Packets/WebSocket/WebsocketPacket.cs @@ -207,8 +207,8 @@ public class WebsocketPacket : Packet } catch (Exception ex) { - Console.WriteLine(ex.ToString()); - Console.WriteLine(offset + "::" + data.ToHex()); + Global.Log(ex); + Global.Log("WebsocketPacket", Core.LogType.Debug, offset + "::" + data.ToHex()); throw ex; } } diff --git a/Esiur/Net/Sockets/TCPSocket.cs b/Esiur/Net/Sockets/TCPSocket.cs index 2acbbc1..8a96d01 100644 --- a/Esiur/Net/Sockets/TCPSocket.cs +++ b/Esiur/Net/Sockets/TCPSocket.cs @@ -458,7 +458,7 @@ public class TCPSocket : ISocket } catch (Exception ex) { - Console.WriteLine(ex); + Global.Log(ex); } finally { diff --git a/Esiur/Net/Sockets/WSocket.cs b/Esiur/Net/Sockets/WSocket.cs index 0b9394b..827c0f0 100644 --- a/Esiur/Net/Sockets/WSocket.cs +++ b/Esiur/Net/Sockets/WSocket.cs @@ -316,7 +316,9 @@ public class WSocket : ISocket, INetworkReceiver } else - Console.WriteLine("Unknown WS opcode:" + pkt_receive.Opcode); + { + Global.Log("WSocket", LogType.Debug, "Unknown WS opcode:" + pkt_receive.Opcode); + } if (offset == msg.Length) { diff --git a/Esiur/Resource/Warehouse.cs b/Esiur/Resource/Warehouse.cs index 4656536..4b02248 100644 --- a/Esiur/Resource/Warehouse.cs +++ b/Esiur/Resource/Warehouse.cs @@ -186,7 +186,7 @@ public static class Warehouse if (!rt) { - Console.WriteLine($"Resource failed at Initialize {r.Instance.Name} [{r.Instance.Template.ClassName}]"); + Global.Log("Warehouse", LogType.Warning, $"Resource failed at Initialize {r.Instance.Name} [{r.Instance.Template.ClassName}]"); } //} } @@ -199,7 +199,7 @@ public static class Warehouse var rt = await r.Trigger(ResourceTrigger.SystemInitialized); if (!rt) { - Console.WriteLine($"Resource failed at SystemInitialized {r.Instance.Name} [{r.Instance.Template.ClassName}]"); + Global.Log("Warehouse", LogType.Warning, $"Resource failed at SystemInitialized {r.Instance.Name} [{r.Instance.Template.ClassName}]"); } //return false; //}