pjandro/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-11-15 08:55:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Code clean

Browse Source
This commit is contained in:
2dust
2024-11-29 19:21:09 +08:00
parent 1c6323315b
commit f685682214
6 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayN/ServiceLib/Handler/AutoStartupHandler.cs
+1 -1
View File
@@ -25,7 +25,7 @@ namespace ServiceLib.Handler
await SetTaskLinux();
}
}
else if(Utils.IsOSX())
else if (Utils.IsOSX())
{
//TODO
}
v2rayN/ServiceLib/Handler/CoreHandler.cs
+6 -26
View File
@@ -98,15 +98,11 @@ namespace ServiceLib.Handler
if (_process != null)
{
await KillProcess(_process);
_process.Dispose();
_process = null;
}
if (_processPre != null)
{
await KillProcess(_processPre);
_processPre.Dispose();
_processPre = null;
}
if (_linuxSudoPid > 0)
@@ -125,8 +121,7 @@ namespace ServiceLib.Handler
{
try
{
var _p = Process.GetProcessById(pid);
await KillProcess(_p);
await KillProcess(Process.GetProcessById(pid));
}
catch (Exception ex)
{
@@ -332,26 +327,11 @@ namespace ServiceLib.Handler
{
return;
}
try
{
proc?.Kill(true);
}
catch (Exception)
{
// ignored
}
try { proc?.Kill(true); } catch { }
try { proc?.Close(); } catch { }
try { proc?.Dispose(); } catch { }
proc = null;
await Task.Delay(100);
if (proc?.HasExited == false)
{
try
{
proc?.Kill();
}
catch (Exception)
{
// ignored
}
}
}
#endregion Process
@@ -408,7 +388,7 @@ namespace ServiceLib.Handler
var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(10));
await proc.WaitForExitAsync(timeout.Token);
await Task.Delay(1000);
await Task.Delay(3000);
}
private async Task<string> CreateLinuxShellFile(string cmdLine, string fileName)