Fix serilog disposing sockets upon receiving them as an argument (why?)

Mooshua · Aug 27, 2023 · 74156ca · 74156ca
1 parent 341c265
commit 74156ca
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 23 deletions.
diff --git a/api/BitMod/BitMod.cs b/api/BitMod/BitMod.cs
@@ -66,6 +66,11 @@ public void Start()
 
 		Logger.Information("[BitMod] Starting server on {@IP}:{@Port}", ip.ToString(), port);
 		_server.Start(ip, port);
+
+		while (true)
+		{
+
+		}
 	}
 
 	public void Stop()

diff --git a/api/BitMod/BitMod.csproj b/api/BitMod/BitMod.csproj
@@ -8,13 +8,12 @@
         <AssemblyName>bitmod</AssemblyName>
         <Company>EdgeGamers</Company>
         <DebugType>embedded</DebugType>
-        <Configurations>Debug;Release</Configurations>
         <Platforms>AnyCPU</Platforms>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="CommunityServerAPI" Version="1.0.4" />
+      <PackageReference Include="CommunityServerAPI" Version="1.0.4.1" />
       <PackageReference Include="Lilikoi" Version="0.1.0-prerelease.28" />
       <PackageReference Include="Serilog" Version="3.0.2-dev-02044" />
     </ItemGroup>

diff --git a/api/BitMod/Handler/BaseHandler.cs b/api/BitMod/Handler/BaseHandler.cs
@@ -23,7 +23,7 @@ public abstract class BaseHandler<TPlayer, TGameServer> : IDisposable
 	public BaseHandler(ServerListener<TPlayer, TGameServer> server)
 	{
 		_server = server;
-		_server.LogLevel |= LogLevel.All;
+		_server.LogLevel = LogLevel.All;
 
 		_server.OnGameServerConnecting += OnGameServerConnecting;
 		_server.OnCreatingGameServerInstance += OnCreatingGameServerInstance;

diff --git a/api/BitMod/Handler/RoutingHandler.cs b/api/BitMod/Handler/RoutingHandler.cs
@@ -33,5 +33,5 @@ public override BitPlayer OnCreatingPlayerInstance(ulong steamid)
 		=> new BitPlayer();
 
 	public override void OnLog(LogLevel name, string value, object? sender)
-		=> _logger.Verbose("[API] {@Level} {@Value} ({@Sender})", name, value, sender);
+		=> _logger.Verbose("[API] {@Level} {@Value}", name, value);
 }
diff --git a/builtin/BitMod.Whitelist/BitMod.Whitelist.csproj b/builtin/BitMod.Whitelist/BitMod.Whitelist.csproj
@@ -15,7 +15,6 @@
 
     <ItemGroup>
       <ProjectReference Include="..\..\api\BitMod\BitMod.csproj" />
-      <ProjectReference Include="..\BitMod.Flags\BitMod.Flags.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/standalone/BitMod.Config/Cache/ConfigWatcher.cs b/standalone/BitMod.Config/Cache/ConfigWatcher.cs
@@ -45,7 +45,6 @@ public ConfigWatcher(string configFileName, ILogger logger, KVSerializer seriali
 		_configObject = new ConfigObject(
 			new KVObject(_configFileName, Enumerable.Empty<KVObject>()));
 
-		_watcher = new FileSystemWatcher();
 		_watcher = new FileSystemWatcher();
 		_watcher.Path = Path.Join(System.Environment.CurrentDirectory, CONFIG_PATH);
 		_watcher.NotifyFilter = NotifyFilters.FileName | NotifyFilters.LastWrite | NotifyFilters.Size | NotifyFilters.Size;

diff --git a/standalone/BitMod.Launcher/BitMod.Launcher.csproj b/standalone/BitMod.Launcher/BitMod.Launcher.csproj
@@ -10,6 +10,8 @@
         <Configurations>Debug;Release</Configurations>
         <Platforms>AnyCPU</Platforms>
 
+        <EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
+
         <PublishDir>$(BitModBuild)</PublishDir>
         <OutDir>$(BitModDev)</OutDir>
         <LangVersion>latest</LangVersion>

diff --git a/standalone/BitMod.Launcher/Program.cs b/standalone/BitMod.Launcher/Program.cs
@@ -1,20 +1,21 @@
-// See https://aka.ms/new-console-template for more information
-
-
-using BitMod.Config;
+using BitMod.Config;
 using BitMod.Logging;
 using BitMod.Plugins;
 
-var configSystem = new ConfigurationSystem();
-var logging = new LoggingSystem(configSystem);
-var pluginSystem = new PluginSystem();
-
-var log = logging.GetLogger();
+public static class Program
+{
+	public static void Main()
+	{
+		var configSystem = new ConfigurationSystem();
+		var logging = new LoggingSystem(configSystem);
+		var pluginSystem = new PluginSystem();
 
-var bitmod = new BitMod.BitMod(log, configSystem, pluginSystem);
+		var log = logging.GetLogger();
 
-bitmod.Start();
+		log.Information("Launching BitMod...");
 
-ManualResetEvent close = new ManualResetEvent(false);
+		var bitmod = new BitMod.BitMod(log, configSystem, pluginSystem);
 
-close.WaitOne();
+		bitmod.Start();
+	}
+}
diff --git a/standalone/BitMod.Logging/LoggingSystem.cs b/standalone/BitMod.Logging/LoggingSystem.cs
@@ -1,4 +1,6 @@
-using BitMod.Public;
+using System.IO;
+
+using BitMod.Public;
 
 using Serilog;
 using Serilog.Events;
@@ -28,7 +30,7 @@ public ILogger GetLogger()
 				LevelAlias.Minimum,
 				theme: AnsiConsoleTheme.Sixteen,
 				outputTemplate: "[{Timestamp:HH:mm:ss}] {Properties} {Level:u4}: {Message:lj}{NewLine}{Exception}" )
-			.WriteTo.File(Path.Join(System.Environment.CurrentDirectory, LOG_PATH, LOG_NAME), LogEventLevel.Debug)
+			.WriteTo.File(Path.Join(System.Environment.CurrentDirectory, LOG_PATH, LOG_NAME), LogEventLevel.Debug, rollingInterval: RollingInterval.Day, retainedFileCountLimit: 60)
 			.CreateLogger();
 	}
 }
diff --git a/standalone/BitMod.Plugins/Plugin.cs b/standalone/BitMod.Plugins/Plugin.cs
@@ -1,4 +1,7 @@
-using System.Reflection;
+using System;
+using System.IO;
+using System.Linq;
+using System.Reflection;
 
 using BitMod.Public;
 

diff --git a/standalone/BitMod.Plugins/PluginWatcher.cs b/standalone/BitMod.Plugins/PluginWatcher.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using System.IO;
+using System.Reflection;
 
 using McMaster.NETCore.Plugins;