diff --git a/Agent/Phantom.Agent.Minecraft/Java/JavaRuntimeDiscovery.cs b/Agent/Phantom.Agent.Minecraft/Java/JavaRuntimeDiscovery.cs index cb27a49..a802783 100644 --- a/Agent/Phantom.Agent.Minecraft/Java/JavaRuntimeDiscovery.cs +++ b/Agent/Phantom.Agent.Minecraft/Java/JavaRuntimeDiscovery.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using Phantom.Common.Data.Java; -using Phantom.Common.Logging; using Phantom.Utils.IO; +using Phantom.Utils.Logging; using Serilog; namespace Phantom.Agent.Minecraft.Java; diff --git a/Agent/Phantom.Agent.Minecraft/Phantom.Agent.Minecraft.csproj b/Agent/Phantom.Agent.Minecraft/Phantom.Agent.Minecraft.csproj index 1c61a3f..1844100 100644 --- a/Agent/Phantom.Agent.Minecraft/Phantom.Agent.Minecraft.csproj +++ b/Agent/Phantom.Agent.Minecraft/Phantom.Agent.Minecraft.csproj @@ -11,8 +11,8 @@ <ItemGroup> <ProjectReference Include="..\..\Common\Phantom.Common.Data\Phantom.Common.Data.csproj" /> - <ProjectReference Include="..\..\Common\Phantom.Common.Logging\Phantom.Common.Logging.csproj" /> <ProjectReference Include="..\..\Utils\Phantom.Utils\Phantom.Utils.csproj" /> + <ProjectReference Include="..\..\Utils\Phantom.Utils.Logging\Phantom.Utils.Logging.csproj" /> </ItemGroup> </Project> diff --git a/Agent/Phantom.Agent.Minecraft/Server/MinecraftServerExecutableDownloader.cs b/Agent/Phantom.Agent.Minecraft/Server/MinecraftServerExecutableDownloader.cs index 0574d6f..6111c5c 100644 --- a/Agent/Phantom.Agent.Minecraft/Server/MinecraftServerExecutableDownloader.cs +++ b/Agent/Phantom.Agent.Minecraft/Server/MinecraftServerExecutableDownloader.cs @@ -1,8 +1,8 @@ using System.Security.Cryptography; using Phantom.Common.Data.Minecraft; -using Phantom.Common.Logging; using Phantom.Utils.Cryptography; using Phantom.Utils.IO; +using Phantom.Utils.Logging; using Phantom.Utils.Runtime; using Serilog; diff --git a/Agent/Phantom.Agent.Minecraft/Server/MinecraftServerExecutables.cs b/Agent/Phantom.Agent.Minecraft/Server/MinecraftServerExecutables.cs index c0c4f87..46b7ab5 100644 --- a/Agent/Phantom.Agent.Minecraft/Server/MinecraftServerExecutables.cs +++ b/Agent/Phantom.Agent.Minecraft/Server/MinecraftServerExecutables.cs @@ -1,7 +1,7 @@ using System.Text.RegularExpressions; using Phantom.Common.Data.Minecraft; -using Phantom.Common.Logging; using Phantom.Utils.IO; +using Phantom.Utils.Logging; using Serilog; namespace Phantom.Agent.Minecraft.Server; diff --git a/Agent/Phantom.Agent.Minecraft/Server/ServerStatusProtocol.cs b/Agent/Phantom.Agent.Minecraft/Server/ServerStatusProtocol.cs index 44630af..c28202c 100644 --- a/Agent/Phantom.Agent.Minecraft/Server/ServerStatusProtocol.cs +++ b/Agent/Phantom.Agent.Minecraft/Server/ServerStatusProtocol.cs @@ -3,7 +3,7 @@ using System.Buffers.Binary; using System.Net; using System.Net.Sockets; using System.Text; -using Phantom.Common.Logging; +using Phantom.Utils.Logging; using Serilog; namespace Phantom.Agent.Minecraft.Server; diff --git a/Agent/Phantom.Agent.Rpc/ControllerConnection.cs b/Agent/Phantom.Agent.Rpc/ControllerConnection.cs index 7943896..01f87f7 100644 --- a/Agent/Phantom.Agent.Rpc/ControllerConnection.cs +++ b/Agent/Phantom.Agent.Rpc/ControllerConnection.cs @@ -1,5 +1,5 @@ -using Phantom.Common.Logging; -using Phantom.Common.Messages.Agent; +using Phantom.Common.Messages.Agent; +using Phantom.Utils.Logging; using Phantom.Utils.Rpc; using Serilog; diff --git a/Agent/Phantom.Agent.Rpc/KeepAliveLoop.cs b/Agent/Phantom.Agent.Rpc/KeepAliveLoop.cs index bcb2c56..25b4f53 100644 --- a/Agent/Phantom.Agent.Rpc/KeepAliveLoop.cs +++ b/Agent/Phantom.Agent.Rpc/KeepAliveLoop.cs @@ -1,6 +1,6 @@ -using Phantom.Common.Logging; -using Phantom.Common.Messages.Agent; +using Phantom.Common.Messages.Agent; using Phantom.Common.Messages.Agent.ToController; +using Phantom.Utils.Logging; using Phantom.Utils.Rpc; using Serilog; diff --git a/Agent/Phantom.Agent.Services/AgentFolders.cs b/Agent/Phantom.Agent.Services/AgentFolders.cs index 1ac7854..174f9fe 100644 --- a/Agent/Phantom.Agent.Services/AgentFolders.cs +++ b/Agent/Phantom.Agent.Services/AgentFolders.cs @@ -1,5 +1,5 @@ -using Phantom.Common.Logging; -using Phantom.Utils.IO; +using Phantom.Utils.IO; +using Phantom.Utils.Logging; using Serilog; namespace Phantom.Agent.Services; diff --git a/Agent/Phantom.Agent.Services/AgentServices.cs b/Agent/Phantom.Agent.Services/AgentServices.cs index 3025436..dedbac1 100644 --- a/Agent/Phantom.Agent.Services/AgentServices.cs +++ b/Agent/Phantom.Agent.Services/AgentServices.cs @@ -3,7 +3,7 @@ using Phantom.Agent.Rpc; using Phantom.Agent.Services.Backups; using Phantom.Agent.Services.Instances; using Phantom.Common.Data.Agent; -using Phantom.Common.Logging; +using Phantom.Utils.Logging; using Phantom.Utils.Tasks; using Serilog; diff --git a/Agent/Phantom.Agent.Services/Backups/BackupArchiver.cs b/Agent/Phantom.Agent.Services/Backups/BackupArchiver.cs index 1693204..c695e01 100644 --- a/Agent/Phantom.Agent.Services/Backups/BackupArchiver.cs +++ b/Agent/Phantom.Agent.Services/Backups/BackupArchiver.cs @@ -3,8 +3,8 @@ using System.Diagnostics.CodeAnalysis; using System.Formats.Tar; using Phantom.Agent.Minecraft.Instance; using Phantom.Common.Data.Backups; -using Phantom.Common.Logging; using Phantom.Utils.IO; +using Phantom.Utils.Logging; using Serilog; namespace Phantom.Agent.Services.Backups; diff --git a/Agent/Phantom.Agent.Services/Backups/BackupCompressor.cs b/Agent/Phantom.Agent.Services/Backups/BackupCompressor.cs index ca77123..8d0d261 100644 --- a/Agent/Phantom.Agent.Services/Backups/BackupCompressor.cs +++ b/Agent/Phantom.Agent.Services/Backups/BackupCompressor.cs @@ -1,4 +1,4 @@ -using Phantom.Common.Logging; +using Phantom.Utils.Logging; using Phantom.Utils.Processes; using Serilog; diff --git a/Agent/Phantom.Agent.Services/Backups/BackupManager.cs b/Agent/Phantom.Agent.Services/Backups/BackupManager.cs index 8cc704e..623aa2b 100644 --- a/Agent/Phantom.Agent.Services/Backups/BackupManager.cs +++ b/Agent/Phantom.Agent.Services/Backups/BackupManager.cs @@ -1,6 +1,6 @@ using Phantom.Agent.Minecraft.Instance; using Phantom.Common.Data.Backups; -using Phantom.Common.Logging; +using Phantom.Utils.Logging; using Serilog; namespace Phantom.Agent.Services.Backups; diff --git a/Agent/Phantom.Agent.Services/Backups/BackupScheduler.cs b/Agent/Phantom.Agent.Services/Backups/BackupScheduler.cs index 9852eda..31fa578 100644 --- a/Agent/Phantom.Agent.Services/Backups/BackupScheduler.cs +++ b/Agent/Phantom.Agent.Services/Backups/BackupScheduler.cs @@ -3,7 +3,7 @@ using Phantom.Agent.Minecraft.Server; using Phantom.Agent.Services.Instances; using Phantom.Agent.Services.Instances.Procedures; using Phantom.Common.Data.Backups; -using Phantom.Common.Logging; +using Phantom.Utils.Logging; using Phantom.Utils.Tasks; using Phantom.Utils.Threading; diff --git a/Agent/Phantom.Agent.Services/Instances/Instance.cs b/Agent/Phantom.Agent.Services/Instances/Instance.cs index 863a904..3771d8d 100644 --- a/Agent/Phantom.Agent.Services/Instances/Instance.cs +++ b/Agent/Phantom.Agent.Services/Instances/Instance.cs @@ -4,8 +4,8 @@ using Phantom.Agent.Services.Instances.States; using Phantom.Common.Data.Instance; using Phantom.Common.Data.Minecraft; using Phantom.Common.Data.Replies; -using Phantom.Common.Logging; using Phantom.Common.Messages.Agent.ToController; +using Phantom.Utils.Logging; using Serilog; namespace Phantom.Agent.Services.Instances; diff --git a/Agent/Phantom.Agent.Services/Instances/InstanceLogSender.cs b/Agent/Phantom.Agent.Services/Instances/InstanceLogSender.cs index cace3e3..7e4bad8 100644 --- a/Agent/Phantom.Agent.Services/Instances/InstanceLogSender.cs +++ b/Agent/Phantom.Agent.Services/Instances/InstanceLogSender.cs @@ -1,8 +1,8 @@ using System.Collections.Immutable; using System.Threading.Channels; using Phantom.Agent.Rpc; -using Phantom.Common.Logging; using Phantom.Common.Messages.Agent.ToController; +using Phantom.Utils.Logging; using Phantom.Utils.Tasks; namespace Phantom.Agent.Services.Instances; diff --git a/Agent/Phantom.Agent.Services/Instances/InstanceSessionManager.cs b/Agent/Phantom.Agent.Services/Instances/InstanceSessionManager.cs index a5460c7..87d0dab 100644 --- a/Agent/Phantom.Agent.Services/Instances/InstanceSessionManager.cs +++ b/Agent/Phantom.Agent.Services/Instances/InstanceSessionManager.cs @@ -13,9 +13,9 @@ using Phantom.Common.Data.Agent; using Phantom.Common.Data.Instance; using Phantom.Common.Data.Minecraft; using Phantom.Common.Data.Replies; -using Phantom.Common.Logging; using Phantom.Common.Messages.Agent.ToController; using Phantom.Utils.IO; +using Phantom.Utils.Logging; using Phantom.Utils.Tasks; using Serilog; diff --git a/Agent/Phantom.Agent.Services/Rpc/MessageListener.cs b/Agent/Phantom.Agent.Services/Rpc/MessageListener.cs index 45d6810..cabf927 100644 --- a/Agent/Phantom.Agent.Services/Rpc/MessageListener.cs +++ b/Agent/Phantom.Agent.Services/Rpc/MessageListener.cs @@ -1,10 +1,10 @@ using Phantom.Common.Data.Instance; using Phantom.Common.Data.Replies; -using Phantom.Common.Logging; using Phantom.Common.Messages.Agent; using Phantom.Common.Messages.Agent.BiDirectional; using Phantom.Common.Messages.Agent.ToAgent; using Phantom.Common.Messages.Agent.ToController; +using Phantom.Utils.Logging; using Phantom.Utils.Rpc; using Phantom.Utils.Rpc.Message; using Serilog; diff --git a/Agent/Phantom.Agent/AgentKey.cs b/Agent/Phantom.Agent/AgentKey.cs index 85776c3..4cb7762 100644 --- a/Agent/Phantom.Agent/AgentKey.cs +++ b/Agent/Phantom.Agent/AgentKey.cs @@ -1,8 +1,8 @@ using NetMQ; using Phantom.Common.Data; -using Phantom.Common.Logging; using Phantom.Utils.Cryptography; using Phantom.Utils.IO; +using Phantom.Utils.Logging; using Serilog; namespace Phantom.Agent; diff --git a/Agent/Phantom.Agent/GuidFile.cs b/Agent/Phantom.Agent/GuidFile.cs index b08e112..4c9b532 100644 --- a/Agent/Phantom.Agent/GuidFile.cs +++ b/Agent/Phantom.Agent/GuidFile.cs @@ -1,6 +1,6 @@ using System.Text; -using Phantom.Common.Logging; using Phantom.Utils.IO; +using Phantom.Utils.Logging; using Serilog; namespace Phantom.Agent; diff --git a/Agent/Phantom.Agent/Program.cs b/Agent/Phantom.Agent/Program.cs index 7805279..f7f2cba 100644 --- a/Agent/Phantom.Agent/Program.cs +++ b/Agent/Phantom.Agent/Program.cs @@ -5,9 +5,9 @@ using Phantom.Agent.Rpc; using Phantom.Agent.Services; using Phantom.Agent.Services.Rpc; using Phantom.Common.Data.Agent; -using Phantom.Common.Logging; using Phantom.Common.Messages.Agent; using Phantom.Common.Messages.Agent.ToController; +using Phantom.Utils.Logging; using Phantom.Utils.Rpc; using Phantom.Utils.Rpc.Sockets; using Phantom.Utils.Runtime; diff --git a/Agent/Phantom.Agent/Variables.cs b/Agent/Phantom.Agent/Variables.cs index 774c6ce..af28742 100644 --- a/Agent/Phantom.Agent/Variables.cs +++ b/Agent/Phantom.Agent/Variables.cs @@ -1,6 +1,6 @@ using Phantom.Agent.Minecraft.Java; using Phantom.Common.Data; -using Phantom.Common.Logging; +using Phantom.Utils.Logging; using Phantom.Utils.Runtime; namespace Phantom.Agent; diff --git a/Common/Phantom.Common.Messages.Agent/AgentMessageRegistries.cs b/Common/Phantom.Common.Messages.Agent/AgentMessageRegistries.cs index 341b46a..a6607f7 100644 --- a/Common/Phantom.Common.Messages.Agent/AgentMessageRegistries.cs +++ b/Common/Phantom.Common.Messages.Agent/AgentMessageRegistries.cs @@ -1,8 +1,8 @@ using Phantom.Common.Data.Replies; -using Phantom.Common.Logging; using Phantom.Common.Messages.Agent.BiDirectional; using Phantom.Common.Messages.Agent.ToAgent; using Phantom.Common.Messages.Agent.ToController; +using Phantom.Utils.Logging; using Phantom.Utils.Rpc.Message; namespace Phantom.Common.Messages.Agent; diff --git a/Common/Phantom.Common.Messages.Agent/Phantom.Common.Messages.Agent.csproj b/Common/Phantom.Common.Messages.Agent/Phantom.Common.Messages.Agent.csproj index cad9d69..9cae257 100644 --- a/Common/Phantom.Common.Messages.Agent/Phantom.Common.Messages.Agent.csproj +++ b/Common/Phantom.Common.Messages.Agent/Phantom.Common.Messages.Agent.csproj @@ -6,8 +6,8 @@ </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\Phantom.Common.Logging\Phantom.Common.Logging.csproj" /> <ProjectReference Include="..\Phantom.Common.Data\Phantom.Common.Data.csproj" /> + <ProjectReference Include="..\..\Utils\Phantom.Utils.Logging\Phantom.Utils.Logging.csproj" /> <ProjectReference Include="..\..\Utils\Phantom.Utils.Rpc\Phantom.Utils.Rpc.csproj" /> </ItemGroup> diff --git a/Common/Phantom.Common.Messages.Web/Phantom.Common.Messages.Web.csproj b/Common/Phantom.Common.Messages.Web/Phantom.Common.Messages.Web.csproj index 4310038..21c6ad8 100644 --- a/Common/Phantom.Common.Messages.Web/Phantom.Common.Messages.Web.csproj +++ b/Common/Phantom.Common.Messages.Web/Phantom.Common.Messages.Web.csproj @@ -6,9 +6,9 @@ </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\Phantom.Common.Logging\Phantom.Common.Logging.csproj" /> <ProjectReference Include="..\Phantom.Common.Data\Phantom.Common.Data.csproj" /> <ProjectReference Include="..\Phantom.Common.Data.Web\Phantom.Common.Data.Web.csproj" /> + <ProjectReference Include="..\..\Utils\Phantom.Utils.Logging\Phantom.Utils.Logging.csproj" /> <ProjectReference Include="..\..\Utils\Phantom.Utils.Rpc\Phantom.Utils.Rpc.csproj" /> </ItemGroup> diff --git a/Common/Phantom.Common.Messages.Web/WebMessageRegistries.cs b/Common/Phantom.Common.Messages.Web/WebMessageRegistries.cs index 6aed657..972289c 100644 --- a/Common/Phantom.Common.Messages.Web/WebMessageRegistries.cs +++ b/Common/Phantom.Common.Messages.Web/WebMessageRegistries.cs @@ -6,10 +6,10 @@ using Phantom.Common.Data.Web.AuditLog; using Phantom.Common.Data.Web.EventLog; using Phantom.Common.Data.Web.Instance; using Phantom.Common.Data.Web.Users; -using Phantom.Common.Logging; using Phantom.Common.Messages.Web.BiDirectional; using Phantom.Common.Messages.Web.ToController; using Phantom.Common.Messages.Web.ToWeb; +using Phantom.Utils.Logging; using Phantom.Utils.Rpc.Message; namespace Phantom.Common.Messages.Web; diff --git a/Controller/Phantom.Controller.Database/DatabaseMigrator.cs b/Controller/Phantom.Controller.Database/DatabaseMigrator.cs index 6deeb3d..f149bd0 100644 --- a/Controller/Phantom.Controller.Database/DatabaseMigrator.cs +++ b/Controller/Phantom.Controller.Database/DatabaseMigrator.cs @@ -1,5 +1,5 @@ using Microsoft.EntityFrameworkCore; -using Phantom.Common.Logging; +using Phantom.Utils.Logging; using Phantom.Utils.Tasks; using Serilog; diff --git a/Controller/Phantom.Controller.Database/Phantom.Controller.Database.csproj b/Controller/Phantom.Controller.Database/Phantom.Controller.Database.csproj index a5536e2..3c7c56a 100644 --- a/Controller/Phantom.Controller.Database/Phantom.Controller.Database.csproj +++ b/Controller/Phantom.Controller.Database/Phantom.Controller.Database.csproj @@ -17,7 +17,7 @@ <ItemGroup> <ProjectReference Include="..\..\Common\Phantom.Common.Data\Phantom.Common.Data.csproj" /> <ProjectReference Include="..\..\Common\Phantom.Common.Data.Web\Phantom.Common.Data.Web.csproj" /> - <ProjectReference Include="..\..\Common\Phantom.Common.Logging\Phantom.Common.Logging.csproj" /> + <ProjectReference Include="..\..\Utils\Phantom.Utils.Logging\Phantom.Utils.Logging.csproj" /> </ItemGroup> </Project> diff --git a/Controller/Phantom.Controller.Minecraft/MinecraftVersionApi.cs b/Controller/Phantom.Controller.Minecraft/MinecraftVersionApi.cs index 4df9a95..d675b5f 100644 --- a/Controller/Phantom.Controller.Minecraft/MinecraftVersionApi.cs +++ b/Controller/Phantom.Controller.Minecraft/MinecraftVersionApi.cs @@ -2,9 +2,9 @@ using System.Net.Http.Json; using System.Text.Json; using Phantom.Common.Data.Minecraft; -using Phantom.Common.Logging; using Phantom.Utils.Cryptography; using Phantom.Utils.IO; +using Phantom.Utils.Logging; using Phantom.Utils.Runtime; using Serilog; diff --git a/Controller/Phantom.Controller.Minecraft/MinecraftVersions.cs b/Controller/Phantom.Controller.Minecraft/MinecraftVersions.cs index f818ed0..03e4156 100644 --- a/Controller/Phantom.Controller.Minecraft/MinecraftVersions.cs +++ b/Controller/Phantom.Controller.Minecraft/MinecraftVersions.cs @@ -1,7 +1,7 @@ using System.Collections.Immutable; using System.Diagnostics; using Phantom.Common.Data.Minecraft; -using Phantom.Common.Logging; +using Phantom.Utils.Logging; using Serilog; namespace Phantom.Controller.Minecraft; diff --git a/Controller/Phantom.Controller.Minecraft/Phantom.Controller.Minecraft.csproj b/Controller/Phantom.Controller.Minecraft/Phantom.Controller.Minecraft.csproj index ecb75fd..54eb5c8 100644 --- a/Controller/Phantom.Controller.Minecraft/Phantom.Controller.Minecraft.csproj +++ b/Controller/Phantom.Controller.Minecraft/Phantom.Controller.Minecraft.csproj @@ -7,8 +7,8 @@ <ItemGroup> <ProjectReference Include="..\..\Common\Phantom.Common.Data\Phantom.Common.Data.csproj" /> - <ProjectReference Include="..\..\Common\Phantom.Common.Logging\Phantom.Common.Logging.csproj" /> <ProjectReference Include="..\..\Utils\Phantom.Utils\Phantom.Utils.csproj" /> + <ProjectReference Include="..\..\Utils\Phantom.Utils.Logging\Phantom.Utils.Logging.csproj" /> </ItemGroup> </Project> diff --git a/Controller/Phantom.Controller.Services/Agents/AgentManager.cs b/Controller/Phantom.Controller.Services/Agents/AgentManager.cs index 884c7ce..a540bbd 100644 --- a/Controller/Phantom.Controller.Services/Agents/AgentManager.cs +++ b/Controller/Phantom.Controller.Services/Agents/AgentManager.cs @@ -2,7 +2,6 @@ using Phantom.Common.Data; using Phantom.Common.Data.Agent; using Phantom.Common.Data.Replies; -using Phantom.Common.Logging; using Phantom.Common.Messages.Agent; using Phantom.Common.Messages.Agent.ToAgent; using Phantom.Controller.Database; @@ -10,6 +9,7 @@ using Phantom.Controller.Rpc; using Phantom.Controller.Services.Instances; using Phantom.Utils.Collections; using Phantom.Utils.Events; +using Phantom.Utils.Logging; using Phantom.Utils.Tasks; using Serilog; diff --git a/Controller/Phantom.Controller.Services/ControllerServices.cs b/Controller/Phantom.Controller.Services/ControllerServices.cs index d228115..a6e9f6d 100644 --- a/Controller/Phantom.Controller.Services/ControllerServices.cs +++ b/Controller/Phantom.Controller.Services/ControllerServices.cs @@ -1,5 +1,4 @@ using Phantom.Common.Data; -using Phantom.Common.Logging; using Phantom.Common.Messages.Agent; using Phantom.Common.Messages.Web; using Phantom.Controller.Database; @@ -10,6 +9,7 @@ using Phantom.Controller.Services.Events; using Phantom.Controller.Services.Instances; using Phantom.Controller.Services.Rpc; using Phantom.Controller.Services.Users; +using Phantom.Utils.Logging; using Phantom.Utils.Tasks; namespace Phantom.Controller.Services; diff --git a/Controller/Phantom.Controller.Services/Instances/InstanceManager.cs b/Controller/Phantom.Controller.Services/Instances/InstanceManager.cs index b4fb771..f95bcd6 100644 --- a/Controller/Phantom.Controller.Services/Instances/InstanceManager.cs +++ b/Controller/Phantom.Controller.Services/Instances/InstanceManager.cs @@ -6,7 +6,6 @@ using Phantom.Common.Data.Minecraft; using Phantom.Common.Data.Replies; using Phantom.Common.Data.Web.Instance; using Phantom.Common.Data.Web.Minecraft; -using Phantom.Common.Logging; using Phantom.Common.Messages.Agent; using Phantom.Common.Messages.Agent.ToAgent; using Phantom.Controller.Database; @@ -16,6 +15,7 @@ using Phantom.Controller.Minecraft; using Phantom.Controller.Services.Agents; using Phantom.Utils.Collections; using Phantom.Utils.Events; +using Phantom.Utils.Logging; using Serilog; namespace Phantom.Controller.Services.Instances; diff --git a/Controller/Phantom.Controller.Services/Rpc/WebMessageListener.cs b/Controller/Phantom.Controller.Services/Rpc/WebMessageListener.cs index 510a32b..0317fda 100644 --- a/Controller/Phantom.Controller.Services/Rpc/WebMessageListener.cs +++ b/Controller/Phantom.Controller.Services/Rpc/WebMessageListener.cs @@ -8,7 +8,6 @@ using Phantom.Common.Data.Web.AuditLog; using Phantom.Common.Data.Web.EventLog; using Phantom.Common.Data.Web.Instance; using Phantom.Common.Data.Web.Users; -using Phantom.Common.Logging; using Phantom.Common.Messages.Web; using Phantom.Common.Messages.Web.BiDirectional; using Phantom.Common.Messages.Web.ToController; @@ -19,6 +18,7 @@ using Phantom.Controller.Services.Agents; using Phantom.Controller.Services.Events; using Phantom.Controller.Services.Instances; using Phantom.Controller.Services.Users; +using Phantom.Utils.Logging; using Phantom.Utils.Rpc.Message; using Phantom.Utils.Tasks; using Serilog; diff --git a/Controller/Phantom.Controller.Services/Users/PermissionManager.cs b/Controller/Phantom.Controller.Services/Users/PermissionManager.cs index 6e00a4e..5427c3e 100644 --- a/Controller/Phantom.Controller.Services/Users/PermissionManager.cs +++ b/Controller/Phantom.Controller.Services/Users/PermissionManager.cs @@ -1,10 +1,10 @@ using System.Collections.Immutable; using Microsoft.EntityFrameworkCore; using Phantom.Common.Data.Web.Users; -using Phantom.Common.Logging; using Phantom.Controller.Database; using Phantom.Controller.Database.Entities; using Phantom.Utils.Collections; +using Phantom.Utils.Logging; using Serilog; namespace Phantom.Controller.Services.Users; diff --git a/Controller/Phantom.Controller.Services/Users/RoleManager.cs b/Controller/Phantom.Controller.Services/Users/RoleManager.cs index fc09c46..e3c24b4 100644 --- a/Controller/Phantom.Controller.Services/Users/RoleManager.cs +++ b/Controller/Phantom.Controller.Services/Users/RoleManager.cs @@ -1,11 +1,11 @@ using System.Collections.Immutable; using Microsoft.EntityFrameworkCore; using Phantom.Common.Data.Web.Users; -using Phantom.Common.Logging; using Phantom.Controller.Database; using Phantom.Controller.Database.Entities; using Phantom.Controller.Database.Repositories; using Phantom.Utils.Collections; +using Phantom.Utils.Logging; using Serilog; namespace Phantom.Controller.Services.Users; diff --git a/Controller/Phantom.Controller.Services/Users/UserManager.cs b/Controller/Phantom.Controller.Services/Users/UserManager.cs index 1bb22f7..2b6899d 100644 --- a/Controller/Phantom.Controller.Services/Users/UserManager.cs +++ b/Controller/Phantom.Controller.Services/Users/UserManager.cs @@ -1,9 +1,9 @@ using System.Collections.Immutable; using Phantom.Common.Data.Web.Users; -using Phantom.Common.Logging; using Phantom.Controller.Database; using Phantom.Controller.Database.Entities; using Phantom.Controller.Database.Repositories; +using Phantom.Utils.Logging; using Serilog; namespace Phantom.Controller.Services.Users; diff --git a/Controller/Phantom.Controller.Services/Users/UserRoleManager.cs b/Controller/Phantom.Controller.Services/Users/UserRoleManager.cs index c29f5ee..56e0b13 100644 --- a/Controller/Phantom.Controller.Services/Users/UserRoleManager.cs +++ b/Controller/Phantom.Controller.Services/Users/UserRoleManager.cs @@ -1,8 +1,8 @@ using System.Collections.Immutable; using Phantom.Common.Data.Web.Users; -using Phantom.Common.Logging; using Phantom.Controller.Database; using Phantom.Controller.Database.Repositories; +using Phantom.Utils.Logging; using Serilog; namespace Phantom.Controller.Services.Users; diff --git a/Controller/Phantom.Controller/ConnectionKeyFiles.cs b/Controller/Phantom.Controller/ConnectionKeyFiles.cs index 1fc3736..6823044 100644 --- a/Controller/Phantom.Controller/ConnectionKeyFiles.cs +++ b/Controller/Phantom.Controller/ConnectionKeyFiles.cs @@ -1,8 +1,8 @@ using NetMQ; using Phantom.Common.Data; -using Phantom.Common.Logging; using Phantom.Utils.Cryptography; using Phantom.Utils.IO; +using Phantom.Utils.Logging; using Serilog; namespace Phantom.Controller; diff --git a/Controller/Phantom.Controller/Phantom.Controller.csproj b/Controller/Phantom.Controller/Phantom.Controller.csproj index 8bdff84..1bd64ea 100644 --- a/Controller/Phantom.Controller/Phantom.Controller.csproj +++ b/Controller/Phantom.Controller/Phantom.Controller.csproj @@ -12,7 +12,6 @@ <ItemGroup> <ProjectReference Include="..\..\Common\Phantom.Common.Data\Phantom.Common.Data.csproj" /> - <ProjectReference Include="..\..\Common\Phantom.Common.Logging\Phantom.Common.Logging.csproj" /> <ProjectReference Include="..\..\Utils\Phantom.Utils\Phantom.Utils.csproj" /> <ProjectReference Include="..\Phantom.Controller.Database.Postgres\Phantom.Controller.Database.Postgres.csproj" /> <ProjectReference Include="..\Phantom.Controller.Minecraft\Phantom.Controller.Minecraft.csproj" /> diff --git a/Controller/Phantom.Controller/Program.cs b/Controller/Phantom.Controller/Program.cs index 78190b4..ddd979d 100644 --- a/Controller/Phantom.Controller/Program.cs +++ b/Controller/Phantom.Controller/Program.cs @@ -1,6 +1,5 @@ using System.Reflection; using NetMQ; -using Phantom.Common.Logging; using Phantom.Common.Messages.Agent; using Phantom.Common.Messages.Web; using Phantom.Controller; @@ -8,6 +7,7 @@ using Phantom.Controller.Database.Postgres; using Phantom.Controller.Rpc; using Phantom.Controller.Services; using Phantom.Utils.IO; +using Phantom.Utils.Logging; using Phantom.Utils.Rpc; using Phantom.Utils.Runtime; using Phantom.Utils.Tasks; diff --git a/Controller/Phantom.Controller/Variables.cs b/Controller/Phantom.Controller/Variables.cs index 13b64ab..71a4a96 100644 --- a/Controller/Phantom.Controller/Variables.cs +++ b/Controller/Phantom.Controller/Variables.cs @@ -1,5 +1,5 @@ using Npgsql; -using Phantom.Common.Logging; +using Phantom.Utils.Logging; using Phantom.Utils.Runtime; namespace Phantom.Controller; diff --git a/PhantomPanel.sln b/PhantomPanel.sln index 52569f2..b913bd0 100644 --- a/PhantomPanel.sln +++ b/PhantomPanel.sln @@ -28,8 +28,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Common.Data.Tests", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Common.Data.Web", "Common\Phantom.Common.Data.Web\Phantom.Common.Data.Web.csproj", "{BC969D0B-0019-48E0-9FAF-F5CC906AAF09}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Common.Logging", "Common\Phantom.Common.Logging\Phantom.Common.Logging.csproj", "{D7F55010-B3ED-42A5-8D83-E754FFC5F2A2}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Common.Messages.Agent", "Common\Phantom.Common.Messages.Agent\Phantom.Common.Messages.Agent.csproj", "{95B55357-F8F0-48C2-A1C2-5EA997651783}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Common.Messages.Web", "Common\Phantom.Common.Messages.Web\Phantom.Common.Messages.Web.csproj", "{6E798DEB-8921-41A2-8AFB-E4416A9E0704}" @@ -50,6 +48,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Utils", "Utils\Phan EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Utils.Events", "Utils\Phantom.Utils.Events\Phantom.Utils.Events.csproj", "{2E81523B-5DBE-4992-A77B-1679758D0688}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Utils.Logging", "Utils\Phantom.Utils.Logging\Phantom.Utils.Logging.csproj", "{FCA141F5-4F18-47C2-9855-14E326FF1219}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Utils.Rpc", "Utils\Phantom.Utils.Rpc\Phantom.Utils.Rpc.csproj", "{BB112660-7A20-45E6-9195-65363B74027F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Phantom.Utils.Tests", "Utils\Phantom.Utils.Tests\Phantom.Utils.Tests.csproj", "{742599E6-2FC2-4B39-85B8-976C98013030}" @@ -96,10 +96,6 @@ Global {BC969D0B-0019-48E0-9FAF-F5CC906AAF09}.Debug|Any CPU.Build.0 = Debug|Any CPU {BC969D0B-0019-48E0-9FAF-F5CC906AAF09}.Release|Any CPU.ActiveCfg = Release|Any CPU {BC969D0B-0019-48E0-9FAF-F5CC906AAF09}.Release|Any CPU.Build.0 = Release|Any CPU - {D7F55010-B3ED-42A5-8D83-E754FFC5F2A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D7F55010-B3ED-42A5-8D83-E754FFC5F2A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7F55010-B3ED-42A5-8D83-E754FFC5F2A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D7F55010-B3ED-42A5-8D83-E754FFC5F2A2}.Release|Any CPU.Build.0 = Release|Any CPU {95B55357-F8F0-48C2-A1C2-5EA997651783}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {95B55357-F8F0-48C2-A1C2-5EA997651783}.Debug|Any CPU.Build.0 = Debug|Any CPU {95B55357-F8F0-48C2-A1C2-5EA997651783}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -140,6 +136,10 @@ Global {2E81523B-5DBE-4992-A77B-1679758D0688}.Debug|Any CPU.Build.0 = Debug|Any CPU {2E81523B-5DBE-4992-A77B-1679758D0688}.Release|Any CPU.ActiveCfg = Release|Any CPU {2E81523B-5DBE-4992-A77B-1679758D0688}.Release|Any CPU.Build.0 = Release|Any CPU + {FCA141F5-4F18-47C2-9855-14E326FF1219}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FCA141F5-4F18-47C2-9855-14E326FF1219}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FCA141F5-4F18-47C2-9855-14E326FF1219}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FCA141F5-4F18-47C2-9855-14E326FF1219}.Release|Any CPU.Build.0 = Release|Any CPU {BB112660-7A20-45E6-9195-65363B74027F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BB112660-7A20-45E6-9195-65363B74027F}.Debug|Any CPU.Build.0 = Debug|Any CPU {BB112660-7A20-45E6-9195-65363B74027F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -167,7 +167,6 @@ Global {665C7B87-0165-48BC-B6A6-17A3812A70C9} = {F5878792-64C8-4ECF-A075-66341FF97127} {AEE8B77E-AB07-423F-9981-8CD829ACB834} = {F5878792-64C8-4ECF-A075-66341FF97127} {6C3DB1E5-F695-4D70-8F3A-78C2957274BE} = {01CB1A81-8950-471C-BFDF-F135FDDB2C18} - {D7F55010-B3ED-42A5-8D83-E754FFC5F2A2} = {01CB1A81-8950-471C-BFDF-F135FDDB2C18} {95B55357-F8F0-48C2-A1C2-5EA997651783} = {01CB1A81-8950-471C-BFDF-F135FDDB2C18} {6E798DEB-8921-41A2-8AFB-E4416A9E0704} = {01CB1A81-8950-471C-BFDF-F135FDDB2C18} {435D7981-DFDA-46A0-8CD8-CD8C117935D7} = {D781E00D-8563-4102-A0CD-477A679193B5} @@ -180,6 +179,7 @@ Global {90F0F1B1-EB0A-49C9-8DF0-1153A87F77C9} = {0AB9471E-6228-4EB7-802E-3102B3952AAD} {384885E2-5113-45C5-9B15-09BDA0911852} = {AA217EB8-E480-456B-BDF3-39419EF2AD85} {2E81523B-5DBE-4992-A77B-1679758D0688} = {AA217EB8-E480-456B-BDF3-39419EF2AD85} + {FCA141F5-4F18-47C2-9855-14E326FF1219} = {AA217EB8-E480-456B-BDF3-39419EF2AD85} {BB112660-7A20-45E6-9195-65363B74027F} = {AA217EB8-E480-456B-BDF3-39419EF2AD85} {742599E6-2FC2-4B39-85B8-976C98013030} = {7A3C7B26-26A0-49B9-8505-5F8267C10F10} {7CA2E5FE-E507-4DC6-930C-E18711A9F856} = {92B26F48-235F-4500-BD55-800F06A0BA39} diff --git a/Common/Phantom.Common.Logging/DefaultLogLevel.cs b/Utils/Phantom.Utils.Logging/DefaultLogLevel.cs similarity index 97% rename from Common/Phantom.Common.Logging/DefaultLogLevel.cs rename to Utils/Phantom.Utils.Logging/DefaultLogLevel.cs index 847a681..9935e44 100644 --- a/Common/Phantom.Common.Logging/DefaultLogLevel.cs +++ b/Utils/Phantom.Utils.Logging/DefaultLogLevel.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; using Serilog.Events; -namespace Phantom.Common.Logging; +namespace Phantom.Utils.Logging; static class DefaultLogLevel { private const string ENVIRONMENT_VARIABLE = "LOG_LEVEL"; diff --git a/Common/Phantom.Common.Logging/LoggerExtensions.cs b/Utils/Phantom.Utils.Logging/LoggerExtensions.cs similarity index 94% rename from Common/Phantom.Common.Logging/LoggerExtensions.cs rename to Utils/Phantom.Utils.Logging/LoggerExtensions.cs index 50ea146..8e285d6 100644 --- a/Common/Phantom.Common.Logging/LoggerExtensions.cs +++ b/Utils/Phantom.Utils.Logging/LoggerExtensions.cs @@ -1,6 +1,6 @@ using Serilog; -namespace Phantom.Common.Logging; +namespace Phantom.Utils.Logging; public static class LoggerExtensions { private static readonly string HeadingPadding = new (' ', 23); diff --git a/Common/Phantom.Common.Logging/Phantom.Common.Logging.csproj b/Utils/Phantom.Utils.Logging/Phantom.Utils.Logging.csproj similarity index 89% rename from Common/Phantom.Common.Logging/Phantom.Common.Logging.csproj rename to Utils/Phantom.Utils.Logging/Phantom.Utils.Logging.csproj index 488cac5..fb43164 100644 --- a/Common/Phantom.Common.Logging/Phantom.Common.Logging.csproj +++ b/Utils/Phantom.Utils.Logging/Phantom.Utils.Logging.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> <ImplicitUsings>enable</ImplicitUsings> diff --git a/Common/Phantom.Common.Logging/PhantomLogger.cs b/Utils/Phantom.Utils.Logging/PhantomLogger.cs similarity index 98% rename from Common/Phantom.Common.Logging/PhantomLogger.cs rename to Utils/Phantom.Utils.Logging/PhantomLogger.cs index 01939e8..1562c75 100644 --- a/Common/Phantom.Common.Logging/PhantomLogger.cs +++ b/Utils/Phantom.Utils.Logging/PhantomLogger.cs @@ -4,7 +4,7 @@ using Serilog.Core; using Serilog.Events; using Serilog.Sinks.SystemConsole.Themes; -namespace Phantom.Common.Logging; +namespace Phantom.Utils.Logging; public static class PhantomLogger { public static Logger Root { get; } = CreateLogger("[{Timestamp:HH:mm:ss} {Level:u}] {Message:lj}{NewLine}{Exception}"); diff --git a/Web/Phantom.Web.Services/Agents/AgentManager.cs b/Web/Phantom.Web.Services/Agents/AgentManager.cs index 5d4955d..5dd3f5e 100644 --- a/Web/Phantom.Web.Services/Agents/AgentManager.cs +++ b/Web/Phantom.Web.Services/Agents/AgentManager.cs @@ -1,7 +1,7 @@ using System.Collections.Immutable; using Phantom.Common.Data.Web.Agent; -using Phantom.Common.Logging; using Phantom.Utils.Events; +using Phantom.Utils.Logging; namespace Phantom.Web.Services.Agents; diff --git a/Web/Phantom.Web.Services/Authentication/UserLoginManager.cs b/Web/Phantom.Web.Services/Authentication/UserLoginManager.cs index 52b59fa..b3c0e2f 100644 --- a/Web/Phantom.Web.Services/Authentication/UserLoginManager.cs +++ b/Web/Phantom.Web.Services/Authentication/UserLoginManager.cs @@ -1,6 +1,6 @@ using Phantom.Common.Data.Web.Users; -using Phantom.Common.Logging; using Phantom.Common.Messages.Web.ToController; +using Phantom.Utils.Logging; using Phantom.Web.Services.Rpc; using ILogger = Serilog.ILogger; diff --git a/Web/Phantom.Web.Services/Authentication/UserSessionBrowserStorage.cs b/Web/Phantom.Web.Services/Authentication/UserSessionBrowserStorage.cs index e67e6e1..c425ae8 100644 --- a/Web/Phantom.Web.Services/Authentication/UserSessionBrowserStorage.cs +++ b/Web/Phantom.Web.Services/Authentication/UserSessionBrowserStorage.cs @@ -1,7 +1,7 @@ using System.Collections.Immutable; using System.Security.Cryptography; using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage; -using Phantom.Common.Logging; +using Phantom.Utils.Logging; using ILogger = Serilog.ILogger; namespace Phantom.Web.Services.Authentication; diff --git a/Web/Phantom.Web.Services/Instances/InstanceLogManager.cs b/Web/Phantom.Web.Services/Instances/InstanceLogManager.cs index 7cc800e..7924e61 100644 --- a/Web/Phantom.Web.Services/Instances/InstanceLogManager.cs +++ b/Web/Phantom.Web.Services/Instances/InstanceLogManager.cs @@ -1,8 +1,8 @@ using System.Collections.Concurrent; using System.Collections.Immutable; -using Phantom.Common.Logging; using Phantom.Utils.Collections; using Phantom.Utils.Events; +using Phantom.Utils.Logging; using ILogger = Serilog.ILogger; namespace Phantom.Web.Services.Instances; diff --git a/Web/Phantom.Web.Services/Instances/InstanceManager.cs b/Web/Phantom.Web.Services/Instances/InstanceManager.cs index 0891dc9..915b908 100644 --- a/Web/Phantom.Web.Services/Instances/InstanceManager.cs +++ b/Web/Phantom.Web.Services/Instances/InstanceManager.cs @@ -3,9 +3,9 @@ using Phantom.Common.Data.Instance; using Phantom.Common.Data.Minecraft; using Phantom.Common.Data.Replies; using Phantom.Common.Data.Web.Instance; -using Phantom.Common.Logging; using Phantom.Common.Messages.Web.ToController; using Phantom.Utils.Events; +using Phantom.Utils.Logging; using Phantom.Web.Services.Rpc; namespace Phantom.Web.Services.Instances; diff --git a/Web/Phantom.Web.Services/Phantom.Web.Services.csproj b/Web/Phantom.Web.Services/Phantom.Web.Services.csproj index 982f919..ff367de 100644 --- a/Web/Phantom.Web.Services/Phantom.Web.Services.csproj +++ b/Web/Phantom.Web.Services/Phantom.Web.Services.csproj @@ -12,9 +12,9 @@ <ItemGroup> <ProjectReference Include="..\..\Common\Phantom.Common.Data\Phantom.Common.Data.csproj" /> <ProjectReference Include="..\..\Common\Phantom.Common.Data.Web\Phantom.Common.Data.Web.csproj" /> - <ProjectReference Include="..\..\Common\Phantom.Common.Logging\Phantom.Common.Logging.csproj" /> <ProjectReference Include="..\..\Common\Phantom.Common.Messages.Web\Phantom.Common.Messages.Web.csproj" /> <ProjectReference Include="..\..\Utils\Phantom.Utils.Events\Phantom.Utils.Events.csproj" /> + <ProjectReference Include="..\..\Utils\Phantom.Utils.Logging\Phantom.Utils.Logging.csproj" /> </ItemGroup> <ItemGroup> diff --git a/Web/Phantom.Web/Base/PhantomComponent.cs b/Web/Phantom.Web/Base/PhantomComponent.cs index f401941..23eda1a 100644 --- a/Web/Phantom.Web/Base/PhantomComponent.cs +++ b/Web/Phantom.Web/Base/PhantomComponent.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Authorization; using Phantom.Common.Data.Web.Users; -using Phantom.Common.Logging; +using Phantom.Utils.Logging; using Phantom.Web.Services.Authorization; using ILogger = Serilog.ILogger; using UserInfo = Phantom.Web.Services.Authentication.UserInfo; diff --git a/Web/Phantom.Web/Program.cs b/Web/Phantom.Web/Program.cs index 7def433..9ab73f6 100644 --- a/Web/Phantom.Web/Program.cs +++ b/Web/Phantom.Web/Program.cs @@ -1,10 +1,10 @@ using System.Reflection; using NetMQ; -using Phantom.Common.Logging; using Phantom.Common.Messages.Web; using Phantom.Common.Messages.Web.ToController; using Phantom.Utils.Cryptography; using Phantom.Utils.IO; +using Phantom.Utils.Logging; using Phantom.Utils.Rpc; using Phantom.Utils.Rpc.Sockets; using Phantom.Utils.Runtime; diff --git a/Web/Phantom.Web/Variables.cs b/Web/Phantom.Web/Variables.cs index 1e1366d..0c007ea 100644 --- a/Web/Phantom.Web/Variables.cs +++ b/Web/Phantom.Web/Variables.cs @@ -1,4 +1,4 @@ -using Phantom.Common.Logging; +using Phantom.Utils.Logging; using Phantom.Utils.Runtime; namespace Phantom.Web; diff --git a/Web/Phantom.Web/WebKey.cs b/Web/Phantom.Web/WebKey.cs index 9fc5cb7..d36657d 100644 --- a/Web/Phantom.Web/WebKey.cs +++ b/Web/Phantom.Web/WebKey.cs @@ -1,8 +1,8 @@ using NetMQ; using Phantom.Common.Data; -using Phantom.Common.Logging; using Phantom.Utils.Cryptography; using Phantom.Utils.IO; +using Phantom.Utils.Logging; using ILogger = Serilog.ILogger; namespace Phantom.Web;