diff options
| author |  vnugent <public@vaughnnugent.com> | 2023-06-16 13:33:43 -0400 |
|---|---|---|
| committer | vnugent <public@vaughnnugent.com> | 2023-06-16 13:33:43 -0400 |
| commit | 44f25885437d6d09ea04cf74db4556df95821d56 (patch) | |
| tree | b7876edf7b36f0c56ec9bcd947dcbcbb4a9b6a1f /lib/Plugins.Runtime/src | |
| parent | abbfe728fde9e0a5643b3c4e85d1cd27b15c59f4 (diff) | |
Some tcp buf, minor bits and bobs
Diffstat (limited to 'lib/Plugins.Runtime/src')
| -rw-r--r-- | lib/Plugins.Runtime/src/LoaderExtensions.cs | 2 | ||||
| -rw-r--r-- | lib/Plugins.Runtime/src/RuntimePluginLoader.cs | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/Plugins.Runtime/src/LoaderExtensions.cs b/lib/Plugins.Runtime/src/LoaderExtensions.cs index d4c100b..e244aa6 100644 --- a/lib/Plugins.Runtime/src/LoaderExtensions.cs +++ b/lib/Plugins.Runtime/src/LoaderExtensions.cs @@ -120,7 +120,7 @@ namespace VNLib.Plugins.Runtime /// </summary> /// <param name="loader"></param> /// <returns>A new <see cref="JsonDocument"/> of the loaded configuration file</returns> - public static JsonDocument GetPluginConfigAsync(this RuntimePluginLoader loader) + public static JsonDocument GetPluginConfig(this RuntimePluginLoader loader) { //Open and read the config file using FileStream confStream = File.OpenRead(loader.PluginConfigPath); diff --git a/lib/Plugins.Runtime/src/RuntimePluginLoader.cs b/lib/Plugins.Runtime/src/RuntimePluginLoader.cs index e7b9404..03a15a1 100644 --- a/lib/Plugins.Runtime/src/RuntimePluginLoader.cs +++ b/lib/Plugins.Runtime/src/RuntimePluginLoader.cs @@ -69,12 +69,12 @@ namespace VNLib.Plugins.Runtime /// <exception cref="ArgumentNullException"></exception> public RuntimePluginLoader(IPluginAssemblyLoader loader, JsonElement? hostConfig, ILogProvider? log) { + Log = log; + Loader = loader ?? throw new ArgumentNullException(nameof(loader)); + //Default to empty config if null, otherwise clone a copy of the host config element HostConfig = hostConfig.HasValue ? Clone(hostConfig.Value) : JsonDocument.Parse("{}"); - Log = log; - Loader = loader; - //Configure watcher if requested if (loader.Config.WatchForReload) { @@ -104,7 +104,7 @@ namespace VNLib.Plugins.Runtime //Get the plugin's configuration file if (FileOperations.FileExists(PluginConfigPath)) { - pluginConfig = this.GetPluginConfigAsync(); + pluginConfig = this.GetPluginConfig(); } else { @@ -151,7 +151,7 @@ namespace VNLib.Plugins.Runtime throw new NotSupportedException("The loading context is not unloadable, you may not dynamically reload plugins"); } - //All plugins must be unloaded forst + //All plugins must be unloaded first UnloadPlugins(); //Reload the assembly and |