Microfixes in loader

Blusutils · Dec 2, 2022 · 4562746 · 4562746
1 parent 63f70dd
commit 4562746
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 29 deletions.
diff --git a/DES-Core/DESrv.Core/DESCoreRunner.cs b/DES-Core/DESrv.Core/DESCoreRunner.cs
@@ -85,36 +85,35 @@ sealed class DESCoreRunner {
         /// </summary>
         /// <exception cref="NotImplementedException">If connection type is not implemented yet</exception>
         public void Go() {
-            CEnd.Logger.Debug(Localizer.Translate("desrv.pdk.loadedexts", "Added {0} extensions: {1}",
-                pdkLoader.GetAvailableExtensions().ToArray().Length, string.Join(", ", pdkLoader.GetAvailableExtensions())));
+            var countOfExts = pdkLoader.GetAvailableExtensions().ToArray().Length;
+            var extsRepr = string.Join(", ", pdkLoader.GetAvailableExtensions());
+            var msg = Localizer.Translate("desrv.pdk.loadedexts", "Added {0} extensions: {1}",
+                countOfExts, extsRepr);
+            CEnd.Logger.Debug(msg);
             foreach (var ext in pdkLoader.GetAvailableExtensions()) {
-                new Thread(() => {
-                    try {
-                        var metadata = ext.GetFieldValue("Metadata") as ExtensionMetadata;
-                        var extSuppDes = new Version(metadata.DESVersion);
-                        if (extSuppDes.Major != DESVersion.Major && extSuppDes.Minor != DESVersion.Minor && extSuppDes.Build != DESVersion.Build) {
-                            CEnd.Logger.Error(
-                                Localizer.Translate("desrv.pdk.errors.notcompatable",
-                                "Error in extension {0}: versions is not same (current DESrv version is {1}; however, this extension supports only {2})",
-                                ext, DESVersion, ext.GetFieldValue("DESVersion")
-                             ));
-                            return;
-                        }
-                        if (extsToLoad.Contains(metadata.ID) || extsToLoad.ToArray().Length == 0) {
-                            pdkLoader.LoadExtension(ext);
-                            new CEnd().Run(() => ext.Entrypoint());
-                        }
-                        /*} catch (System.ArgumentNullException) {
-                            CEnd.Logger.Error($"Extension {ext} is null");*/
-                    } catch (Exception ex) {
+                try {
+                    var metadata = ext.GetPropertyValue("Metadata") as ExtensionMetadata;
+                    var extSuppDes = new Version(metadata.DESVersion);
+                    if (extSuppDes.Major != DESVersion.Major && extSuppDes.Minor != DESVersion.Minor && extSuppDes.Build != DESVersion.Build) {
                         CEnd.Logger.Error(
-                            Localizer.Translate(
-                                "desrv.pdk.errors.exterror",
-                                "Error {0} in {1} (from method {2}, caused by {3}). Exception: {4}\nStack trace: \n{5}",
-                                ext.ToString(), ext, ex.TargetSite, ex.Source, ex.Message, ex.StackTrace
-                            ));
+                            Localizer.Translate("desrv.pdk.errors.notcompatable",
+                            "Error in extension {0}: versions is not same (current DESrv version is {1}; however, this extension supports only {2})",
+                            ext, DESVersion, ext.GetFieldValue("DESVersion")
+                         ));
+                        return;
                     }
-                }).Start();
+                    if (extsToLoad.Contains(metadata.ID) || extsToLoad.ToArray().Length == 0) {
+                        pdkLoader.LoadExtension(ext);
+                        new CEnd().Run(() => ext.Entrypoint());
+                    }
+                } catch (Exception ex) {
+                    CEnd.Logger.Error(
+                        Localizer.Translate(
+                            "desrv.pdk.errors.exterror",
+                            "Error {0} in {1} (from method {2}, caused by {3}). Exception: {4}\nStack trace: \n{5}",
+                            ext.ToString(), ext, ex.TargetSite, ex.Source, ex.Message, ex.StackTrace
+                        ));
+                }
             }
 
             var ipadress = config.ipAdress ?? "127.0.0.1";

diff --git a/DES-Core/DESrv.Core/DESrv.Core.csproj b/DES-Core/DESrv.Core/DESrv.Core.csproj
@@ -34,7 +34,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DESCEndLib" Version="1.0.0" />
+    <PackageReference Include="DESCEndLib" Version="1.1.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/DES-Core/DESrv.PDK/AbstractPDKExtension.cs b/DES-Core/DESrv.PDK/AbstractPDKExtension.cs
@@ -78,7 +78,7 @@ public abstract class AbstractPDKExtension : AbstractFPReaderInClass {
                 3 => "random",
                 _ => "unknown",
             };
-            return $"Extension {{type={whatisthis} id={GetFieldValue("ID") as string} version={GetFieldValue("Version")}}}";
+            return $"Extension {{type={whatisthis} id={metadata.ID} version={metadata.Version}}}";
         }
 
         public sealed override object GetFieldValue(string name) {