From ff7ae731569e63c9b8e9a9c2c22c1101cab01a57 Mon Sep 17 00:00:00 2001 From: ChsBuffer <33744752+chsbuffer@users.noreply.github.com> Date: Fri, 16 Jul 2021 03:25:35 +0800 Subject: [PATCH] Update using FileStream --- Netch/Interops/Redirector.cs | 1 - Netch/Servers/V2ray/V2rayController.cs | 2 +- Netch/Utils/Configuration.cs | 15 ++++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Netch/Interops/Redirector.cs b/Netch/Interops/Redirector.cs index 8c06f89d..63602570 100644 --- a/Netch/Interops/Redirector.cs +++ b/Netch/Interops/Redirector.cs @@ -55,7 +55,6 @@ namespace Netch.Interops public static async Task FreeAsync() { - return await Task.Run(aio_free).ConfigureAwait(false); } diff --git a/Netch/Servers/V2ray/V2rayController.cs b/Netch/Servers/V2ray/V2rayController.cs index ff065a84..62e5a230 100644 --- a/Netch/Servers/V2ray/V2rayController.cs +++ b/Netch/Servers/V2ray/V2rayController.cs @@ -30,7 +30,7 @@ namespace Netch.Servers public virtual async Task StartAsync(Server s) { - using (var fileStream = new FileStream(Constants.TempConfig, FileMode.Create, FileAccess.Write, FileShare.Read)) + await using (var fileStream = new FileStream(Constants.TempConfig, FileMode.Create, FileAccess.Write, FileShare.Read)) { await JsonSerializer.SerializeAsync(fileStream, await V2rayConfigUtils.GenerateClientConfigAsync(s), Global.NewCustomJsonSerializerOptions()); } diff --git a/Netch/Utils/Configuration.cs b/Netch/Utils/Configuration.cs index 3c9c63f5..00395551 100644 --- a/Netch/Utils/Configuration.cs +++ b/Netch/Utils/Configuration.cs @@ -62,15 +62,16 @@ namespace Netch.Utils { try { - var fs = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, true); - await using (fs.ConfigureAwait(false)) - { - var settings = (await JsonSerializer.DeserializeAsync(fs, JsonSerializerOptions).ConfigureAwait(false))!; + Setting settings; - CheckSetting(settings); - Global.Settings = settings; - return true; + await using (var fs = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, true)) + { + settings = (await JsonSerializer.DeserializeAsync(fs, JsonSerializerOptions).ConfigureAwait(false))!; } + + CheckSetting(settings); + Global.Settings = settings; + return true; } catch (Exception e) {