diff options
Diffstat (limited to 'Plugins')
-rw-r--r-- | Plugins/CacheBroker/CacheBroker.csproj | 1 | ||||
-rw-r--r-- | Plugins/CacheBroker/CacheBrokerEntry.cs | 21 | ||||
-rw-r--r-- | Plugins/CacheBroker/Endpoints/BrokerRegistrationEndpoint.cs | 14 | ||||
-rw-r--r-- | Plugins/SessionCacheServer/Endpoints/BrokerHeartBeat.cs | 22 | ||||
-rw-r--r-- | Plugins/SessionCacheServer/Endpoints/ConnectEndpoint.cs | 22 | ||||
-rw-r--r-- | Plugins/SessionCacheServer/ObjectCacheServer.csproj (renamed from Plugins/SessionCacheServer/SessionCacheServer.csproj) | 2 | ||||
-rw-r--r-- | Plugins/SessionCacheServer/ObjectCacheServerEntry.cs (renamed from Plugins/SessionCacheServer/SessionServerEntrypoint.cs) | 30 | ||||
-rw-r--r-- | Plugins/SessionProvider/GlobalCache.cs | 14 | ||||
-rw-r--r-- | Plugins/SessionProvider/LocalizedLogProvider.cs | 14 | ||||
-rw-r--r-- | Plugins/SessionProvider/SessionClientEntryPoint.cs | 14 |
10 files changed, 75 insertions, 79 deletions
diff --git a/Plugins/CacheBroker/CacheBroker.csproj b/Plugins/CacheBroker/CacheBroker.csproj index 5f8d771..47a48cf 100644 --- a/Plugins/CacheBroker/CacheBroker.csproj +++ b/Plugins/CacheBroker/CacheBroker.csproj @@ -35,6 +35,7 @@ <ItemGroup> <ProjectReference Include="..\..\..\..\VNLib\Essentials\VNLib.Plugins.Essentials.csproj" /> + <ProjectReference Include="..\..\..\..\VNLib\Hashing\src\VNLib.Hashing.Portable.csproj" /> <ProjectReference Include="..\..\..\Extensions\VNLib.Plugins.Extensions.Loading\VNLib.Plugins.Extensions.Loading.csproj" /> <ProjectReference Include="..\..\..\PluginBase\VNLib.Plugins.PluginBase.csproj" /> <ProjectReference Include="..\..\..\VNLib.Net.Rest.Client\VNLib.Net.Rest.Client.csproj" /> diff --git a/Plugins/CacheBroker/CacheBrokerEntry.cs b/Plugins/CacheBroker/CacheBrokerEntry.cs index 876e030..7fea7fa 100644 --- a/Plugins/CacheBroker/CacheBrokerEntry.cs +++ b/Plugins/CacheBroker/CacheBrokerEntry.cs @@ -9,21 +9,20 @@ * VNLib collection of libraries and utilities. * * CacheBroker is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published -* by the Free Software Foundation, either version 2 of the License, -* or (at your option) any later version. +* it under the terms of the GNU Affero General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. * * CacheBroker is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. * -* You should have received a copy of the GNU General Public License -* along with CacheBroker. If not, see http://www.gnu.org/licenses/. +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see https://www.gnu.org/licenses/. */ using System; -using System.IO; using System.Collections.Generic; using VNLib.Utils.Logging; @@ -34,7 +33,7 @@ namespace VNLib.Plugins.Cache.Broker { public sealed class CacheBrokerEntry : PluginBase { - public override string PluginName => "Cache.Broker"; + public override string PluginName => "ObjectCache.Broker"; protected override void OnLoad() { @@ -44,10 +43,6 @@ namespace VNLib.Plugins.Cache.Broker Log.Information("Plugin loaded"); } - catch (FileNotFoundException) - { - Log.Error("Public key file was not found at the specified path"); - } catch (KeyNotFoundException knf) { Log.Error("Required configuration keys were not found {mess}", knf.Message); diff --git a/Plugins/CacheBroker/Endpoints/BrokerRegistrationEndpoint.cs b/Plugins/CacheBroker/Endpoints/BrokerRegistrationEndpoint.cs index 1c8cd5a..2c454bf 100644 --- a/Plugins/CacheBroker/Endpoints/BrokerRegistrationEndpoint.cs +++ b/Plugins/CacheBroker/Endpoints/BrokerRegistrationEndpoint.cs @@ -9,17 +9,17 @@ * VNLib collection of libraries and utilities. * * CacheBroker is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published -* by the Free Software Foundation, either version 2 of the License, -* or (at your option) any later version. +* it under the terms of the GNU Affero General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. * * CacheBroker is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. * -* You should have received a copy of the GNU General Public License -* along with CacheBroker. If not, see http://www.gnu.org/licenses/. +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see https://www.gnu.org/licenses/. */ using System; diff --git a/Plugins/SessionCacheServer/Endpoints/BrokerHeartBeat.cs b/Plugins/SessionCacheServer/Endpoints/BrokerHeartBeat.cs index dc31575..bad0f7a 100644 --- a/Plugins/SessionCacheServer/Endpoints/BrokerHeartBeat.cs +++ b/Plugins/SessionCacheServer/Endpoints/BrokerHeartBeat.cs @@ -2,24 +2,24 @@ * Copyright (c) 2022 Vaughn Nugent * * Library: VNLib -* Package: SessionCacheServer +* Package: ObjectCacheServer * File: BrokerHeartBeat.cs * -* BrokerHeartBeat.cs is part of SessionCacheServer which is part of the larger +* BrokerHeartBeat.cs is part of ObjectCacheServer which is part of the larger * VNLib collection of libraries and utilities. * -* SessionCacheServer is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published -* by the Free Software Foundation, either version 2 of the License, -* or (at your option) any later version. +* ObjectCacheServer is free software: you can redistribute it and/or modify +* it under the terms of the GNU Affero General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. * -* SessionCacheServer is distributed in the hope that it will be useful, +* ObjectCacheServer is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. * -* You should have received a copy of the GNU General Public License -* along with SessionCacheServer. If not, see http://www.gnu.org/licenses/. +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see https://www.gnu.org/licenses/. */ using System; diff --git a/Plugins/SessionCacheServer/Endpoints/ConnectEndpoint.cs b/Plugins/SessionCacheServer/Endpoints/ConnectEndpoint.cs index 56c7036..dc94825 100644 --- a/Plugins/SessionCacheServer/Endpoints/ConnectEndpoint.cs +++ b/Plugins/SessionCacheServer/Endpoints/ConnectEndpoint.cs @@ -2,24 +2,24 @@ * Copyright (c) 2022 Vaughn Nugent * * Library: VNLib -* Package: SessionCacheServer +* Package: ObjectCacheServer * File: ConnectEndpoint.cs * -* ConnectEndpoint.cs is part of SessionCacheServer which is part of the larger +* ConnectEndpoint.cs is part of ObjectCacheServer which is part of the larger * VNLib collection of libraries and utilities. * -* SessionCacheServer is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published -* by the Free Software Foundation, either version 2 of the License, -* or (at your option) any later version. +* ObjectCacheServer is free software: you can redistribute it and/or modify +* it under the terms of the GNU Affero General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. * -* SessionCacheServer is distributed in the hope that it will be useful, +* ObjectCacheServer is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. * -* You should have received a copy of the GNU General Public License -* along with SessionCacheServer. If not, see http://www.gnu.org/licenses/. +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see https://www.gnu.org/licenses/. */ using System; diff --git a/Plugins/SessionCacheServer/SessionCacheServer.csproj b/Plugins/SessionCacheServer/ObjectCacheServer.csproj index 580bac3..5598acc 100644 --- a/Plugins/SessionCacheServer/SessionCacheServer.csproj +++ b/Plugins/SessionCacheServer/ObjectCacheServer.csproj @@ -42,7 +42,7 @@ <ItemGroup> - <None Update="SessionCacheServer.json"> + <None Update="ObjectCacheServer.json"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> </ItemGroup> diff --git a/Plugins/SessionCacheServer/SessionServerEntrypoint.cs b/Plugins/SessionCacheServer/ObjectCacheServerEntry.cs index c7b0914..6c969ba 100644 --- a/Plugins/SessionCacheServer/SessionServerEntrypoint.cs +++ b/Plugins/SessionCacheServer/ObjectCacheServerEntry.cs @@ -2,24 +2,24 @@ * Copyright (c) 2022 Vaughn Nugent * * Library: VNLib -* Package: SessionCacheServer -* File: SessionServerEntrypoint.cs +* Package: ObjectCacheServer +* File: ObjectCacheServerEntry.cs * -* SessionServerEntrypoint.cs is part of SessionCacheServer which is part of the larger +* ObjectCacheServerEntry.cs is part of ObjectCacheServer which is part of the larger * VNLib collection of libraries and utilities. * -* SessionCacheServer is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published -* by the Free Software Foundation, either version 2 of the License, -* or (at your option) any later version. +* ObjectCacheServer is free software: you can redistribute it and/or modify +* it under the terms of the GNU Affero General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. * -* SessionCacheServer is distributed in the hope that it will be useful, +* ObjectCacheServer is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. * -* You should have received a copy of the GNU General Public License -* along with SessionCacheServer. If not, see http://www.gnu.org/licenses/. +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see https://www.gnu.org/licenses/. */ using System; @@ -53,9 +53,9 @@ using VNLib.Plugins.Essentials.Sessions.Server.Endpoints; namespace VNLib.Plugins.Essentials.Sessions.Server { - public sealed class SessionServerEntrypoint : PluginBase + public sealed class ObjectCacheServerEntry : PluginBase { - public override string PluginName => "Session.Cache.Service"; + public override string PluginName => "ObjectCache.Service"; private string? BrokerHeartBeatToken; @@ -69,7 +69,7 @@ namespace VNLib.Plugins.Essentials.Sessions.Server string brokerAddress = clusterConf["broker_address"].GetString() ?? throw new KeyNotFoundException("Missing required key 'broker_address' for config 'cluster'"); - string swapDir = PluginConfig.GetProperty("swap_dir").GetString(); + string swapDir = PluginConfig.GetProperty("swap_dir").GetString() ?? throw new KeyNotFoundException("Missing required key 'swap_dir' for config"); int cacheSize = PluginConfig.GetProperty("max_cache").GetInt32(); string connectPath = PluginConfig.GetProperty("connect_path").GetString() ?? throw new KeyNotFoundException("Missing required element 'connect_path' for config 'cluster'"); TimeSpan cleanupInterval = PluginConfig.GetProperty("cleanup_interval_sec").GetTimeSpan(TimeParseType.Seconds); diff --git a/Plugins/SessionProvider/GlobalCache.cs b/Plugins/SessionProvider/GlobalCache.cs index c060f82..2f64632 100644 --- a/Plugins/SessionProvider/GlobalCache.cs +++ b/Plugins/SessionProvider/GlobalCache.cs @@ -9,17 +9,17 @@ * VNLib collection of libraries and utilities. * * SessionProvider is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published -* by the Free Software Foundation, either version 2 of the License, -* or (at your option) any later version. +* it under the terms of the GNU Affero General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. * * SessionProvider is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. * -* You should have received a copy of the GNU General Public License -* along with SessionProvider. If not, see http://www.gnu.org/licenses/. +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see https://www.gnu.org/licenses/. */ using System; diff --git a/Plugins/SessionProvider/LocalizedLogProvider.cs b/Plugins/SessionProvider/LocalizedLogProvider.cs index 6fc3ee3..4062a19 100644 --- a/Plugins/SessionProvider/LocalizedLogProvider.cs +++ b/Plugins/SessionProvider/LocalizedLogProvider.cs @@ -9,17 +9,17 @@ * VNLib collection of libraries and utilities. * * SessionProvider is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published -* by the Free Software Foundation, either version 2 of the License, -* or (at your option) any later version. +* it under the terms of the GNU Affero General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. * * SessionProvider is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. * -* You should have received a copy of the GNU General Public License -* along with SessionProvider. If not, see http://www.gnu.org/licenses/. +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see https://www.gnu.org/licenses/. */ using System; diff --git a/Plugins/SessionProvider/SessionClientEntryPoint.cs b/Plugins/SessionProvider/SessionClientEntryPoint.cs index 4be9c55..f429831 100644 --- a/Plugins/SessionProvider/SessionClientEntryPoint.cs +++ b/Plugins/SessionProvider/SessionClientEntryPoint.cs @@ -9,17 +9,17 @@ * VNLib collection of libraries and utilities. * * SessionProvider is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published -* by the Free Software Foundation, either version 2 of the License, -* or (at your option) any later version. +* it under the terms of the GNU Affero General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. * * SessionProvider is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* General Public License for more details. +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. * -* You should have received a copy of the GNU General Public License -* along with SessionProvider. If not, see http://www.gnu.org/licenses/. +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see https://www.gnu.org/licenses/. */ using System; |