Refact

Author: vertigra

src/RemotePythonExecution.Services/RemotePythonExecutionService.cs

@@ -69,7 +69,7 @@ public RemotePythonExecutionService(IServiceProvider serviceProvider)
 
             Subscribe();
             mTcpServer.Start();
-            mLogger.LogInformation("Server runing on {ip}:{port}", Ip, Port);
+            mLogger.LogInformation("Servers runing on {ip}:{port}", Ip, Port);
         }
 
         #endregion
@@ -94,6 +94,7 @@ private void UnSubscribe()
             mTcpServer.Events.ClientDisconnected -= ClientDisconnected;
             mTcpServer.Events.MessageReceived -= MessageReceived;
             mTcpServer.Events.ExceptionEncountered -= ExceptionEncountered;
+
             AppDomain.CurrentDomain.ProcessExit -= AppProcessExit;
         }
 
@@ -109,35 +110,31 @@ private void OnChangeSettings(AppSettings settings, string arg2)
 
         private void ClientConnected(object sender, ConnectionEventArgs e)
         {
-            mLogger.LogInformation("Client connected. Connection id: {Guid}", e.Client.Guid);
             var ip = e.Client.IpPort.Split(':').FirstOrDefault();
             mCurrentClientParam = (e.Client.Guid, ip);
 
             IsOutputEnded = false;
-            IsProcessEnded = false;
+            mLogger.LogInformation("Client connected. Connection id: {Guid}. Client ip: {ip}", e.Client.Guid, ip);
         }
 
         private void ClientDisconnected(object sender, DisconnectionEventArgs e)
         {
             mLogger.LogInformation("Client disconnected. Connection id: {Guid}", e.Client.Guid);
 
             KillProcess();
-            IsOutputEnded = true;
         }
 
         private void ExceptionEncountered(object sender, ExceptionEventArgs e)
         {
             if (e.Exception is IOException)
-                return;
+                mLogger.LogError("IOException");
 
             /*if (e.Exception is SocketException)
-                return;
+                return;*/
 
             if (e.Exception is OperationCanceledException)
-            {
                 mLogger.LogError("OperationCanceledException");
-                return;
-            }*/
+            
 
             mLogger.LogError("Error happened {errorMessage}", e.Exception);
         }
@@ -186,7 +183,7 @@ private void MessageReceived(object sender, MessageReceivedEventArgs e)
                             mLogger.LogInformation("Exit by client request");
 
                             KillProcess();
-                            mIsOutputEnded = true;
+                            //IsOutputEnded = true;
                             break;
                         }
                 }
@@ -199,12 +196,11 @@ private void ProcessErrorDataReceived(object sender, DataReceivedEventArgs e)
             {
                 try
                 {
-                    var data = Encoding.UTF8.GetBytes(e.Data);
-
-                    mUdpEndpoint.SendAsync(mCurrentClientParam.ip, 19000, data);
+                    //var data = Encoding.UTF8.GetBytes(e.Data);
+                    mUdpEndpoint.SendAsync(mCurrentClientParam.ip, Port, e.Data);
 
                     mLogger.LogDebug("{data}", e.Data);
-                    IsOutputEnded = false;
+                    
                 }
                 catch (Exception exp)
                 {
@@ -220,13 +216,13 @@ private void ProcessOutputDataReceived(object sender, DataReceivedEventArgs e)
             {
                 try
                 {
-                    var data = Encoding.UTF8.GetBytes(e.Data);
-                    mUdpEndpoint.SendAsync(mCurrentClientParam.ip, 19000, data);
+                    //var data = Encoding.UTF8.GetBytes(e.Data);
+                    mUdpEndpoint.SendAsync(mCurrentClientParam.ip, Port, e.Data);
 
 
                     mLogger.LogDebug("{data}", e.Data);
                 }
-                catch (TaskCanceledException)
+                /*catch (TaskCanceledException)
                 {
                     mLogger.LogError("Task was canceled");
                     IsOutputEnded = true;
@@ -238,7 +234,7 @@ private void ProcessOutputDataReceived(object sender, DataReceivedEventArgs e)
                 catch (OperationCanceledException)
                 {
                     mLogger.LogError("Operation canceled");
-                }
+                }*/
                 catch (Exception exp)
                 {
                     mLogger.LogError("Catch happened {exp}", exp);
@@ -247,16 +243,15 @@ private void ProcessOutputDataReceived(object sender, DataReceivedEventArgs e)
             }
             else
             {
-                mLogger.LogDebug("Output ended happened");
+                mLogger.LogInformation("Output ended happened");
                 //await Task.Delay(100);
                 IsOutputEnded = true;
             }
         }
 
         private void ProcessExited(object sender, EventArgs e)
         {
-            mLogger.LogDebug("Process ended happened");
-            IsProcessEnded = true;
+            mLogger.LogInformation("Process ended happened");
         }
 
         private void AppProcessExit(object sender, EventArgs e)
@@ -285,13 +280,14 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         {
             while (!stoppingToken.IsCancellationRequested)
             {
-                while (IsOutputEnded && IsProcessEnded)
+                while (IsOutputEnded)
+                //while (IsOutputEnded && IsProcessEnded)
                 {
                     IsOutputEnded = false;
-                    IsProcessEnded = false;
+                    //IsProcessEnded = false;
 
-                    /*if (mProcess == null)
-                        return;*/
+                    //if (mProcess == null)
+                    //    return;
 
                     ExitData exitData = new(); 
 
@@ -311,8 +307,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                                 ExitCode = mProcess.ExitCode
                             };
 
-                            
-                            //mProcess.Dispose();
+                            mProcess.Dispose();
                             //mProcess = null;
                         }
                     }
@@ -326,6 +321,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
                     if (mTcpServer.IsClientConnected(mCurrentClientParam.Guid))
                     {
+                        mLogger.LogInformation("Send exit data");
                         await mTcpServer.SendAsync(mCurrentClientParam.Guid, string.Empty, exitDictonary, token: stoppingToken);
                         await mTcpServer.DisconnectClientAsync(mCurrentClientParam.Guid, MessageStatus.Removed, true, stoppingToken);
                     }
@@ -336,12 +332,6 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
             }
         }
 
-        public override Task StopAsync(CancellationToken cancellationToken)
-        {
-            mLogger.LogError("Host stopped");
-
-            return base.StopAsync(cancellationToken);
-        }
         #endregion
 
         #region Private fields
@@ -358,7 +348,7 @@ private bool IsOutputEnded
             }
         }
 
-        private bool IsProcessEnded
+        /*private bool IsProcessEnded
         {
             get { return mIsProcessEnded; }
             set 
@@ -368,7 +358,7 @@ private bool IsProcessEnded
 
                 mIsProcessEnded = value; 
             }
-        }
+        }*/
 
         private string InterpreterPath
         {
@@ -416,7 +406,6 @@ private string SourceCodeSavePath
                 mSourceCodeSavePath = value;
                 mLogger.LogDebug("New path for {name} register with values {value}", nameof(SourceCodeSavePath), SourceCodeSavePath);
             }
-
         }
 
         private string mIp = string.Empty;
@@ -464,9 +453,8 @@ private int Port
         #region Private methods
 
         private void KillProcess()
-        {   
-            if(mProcess == null) 
-                return;
+        {
+            IsOutputEnded = true;
 
             try
             {
@@ -477,6 +465,7 @@ private void KillProcess()
                 mProcess.CancelOutputRead();
 
                 mProcess.Kill(entireProcessTree: true);
+                mLogger.LogInformation("KillProcess(): {id},", mProcess.Id);
             }
             catch (Exception ex)
             {
@@ -494,17 +483,23 @@ private void OnServerAddressChange()
                 if(mTcpServer.Connections != 0)
                 {
                     KillProcess();
-                    IsOutputEnded = true;
                 }
 
                 mTcpServer.Stop();
+
+                mTcpServer.Dispose();
+                mUdpEndpoint.Dispose();
+                
                 UnSubscribe();
             }
 
             mTcpServer = new WatsonTcpServer(Ip, Port);
+            mUdpEndpoint = new UdpEndpoint(Ip, Port);
+
             Subscribe();
             mTcpServer.Start();
-            mLogger.LogInformation("Server runing on {ip}:{port}", Ip, Port);
+
+            mLogger.LogInformation("Servers runing on {ip}:{port}", Ip, Port);
         }
 
         private void SetPath(AppSettings appSettings)
@@ -561,7 +556,7 @@ private void StartProcess(bool withDebug = false)
             mProcess = new()
             {
                 StartInfo = proccesInfo,
-                EnableRaisingEvents = true,
+                EnableRaisingEvents = true
             };
 
             mProcess.Exited += ProcessExited;
@@ -571,7 +566,7 @@ private void StartProcess(bool withDebug = false)
 
             mProcess.BeginOutputReadLine();
             mProcess.BeginErrorReadLine();
-            
+
             mProcess.WaitForExit();
         }
 
@@ -584,7 +579,7 @@ protected virtual void Dispose(bool disposing)
                 if (disposing)
                 {
                     KillProcess();
-                    IsOutputEnded = true;
+                    //sOutputEnded = true;
 
                     UnSubscribe();
                     mTcpServer.Stop();

src/RemotePythonExecution/appsettings.json

@@ -2,7 +2,7 @@
   "Serilog": {
     "Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File" ],
     "MinimumLevel": {
-      "Default": "Debug",
+      "Default": "Information",
       "Override": {
         "Microsoft": "Warning",
         "System": "Warning"