GitHub/netch
1
0
Fork 0
mirror of https://github.com/netchx/netch.git synced 2026-05-09 22:54:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

控制器日志写入线程安全,主控制器启动停止等改为异步执行，修复主控制器停止提前释放

Browse Source
This commit is contained in:
ChsBuffer
2020-08-08 00:31:40 +08:00
parent 689f29d0f0
commit 3d24aa7583
9 changed files with 129 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Netch/Forms/MainForm.Control.cs
View File

@@ -40,26 +40,22 @@ namespace Netch.Forms
State = State.Starting;
await Task.Run(Firewall.AddNetchFwRules);
var server = ServerComboBox.SelectedItem as Models.Server;
var mode = ModeComboBox.SelectedItem as Models.Mode;
var result = false;
await Task.Run(() =>
try
{
try
{
// TODO 完善控制器异常处理
result = _mainController.Start(server, mode);
}
catch (Exception e)
{
if (e is DllNotFoundException || e is FileNotFoundException)
MessageBoxX.Show(e.Message + "\n\n" + i18N.Translate("Missing File or runtime components"), owner: this);
Netch.Application_OnException(null, new ThreadExceptionEventArgs(e));
}
});
// TODO 完善控制器异常处理
result = await _mainController.Start(server, mode);
}
catch (Exception e)
{
if (e is DllNotFoundException || e is FileNotFoundException)
MessageBoxX.Show(e.Message + "\n\n" + i18N.Translate("Missing File or runtime components"), owner: this);
Netch.Application_OnException(null, new ThreadExceptionEventArgs(e));
}
if (result)
{
@@ -106,7 +102,7 @@ namespace Netch.Forms
{
// 停止
State = State.Stopping;
_mainController.Stop();
await _mainController.Stop();
State = State.Stopped;
_ = Task.Run(TestServer);
}