feat: logging improved

fix: initial license check

Author: ky-one

Common/Licensing/GlobalLicenseService.cs

@@ -1,4 +1,5 @@
-using KY.Core;
+using System;
+using KY.Core;
 using KY.Core.DataAccess;
 using KY.Generator.Models;
 using Newtonsoft.Json;
@@ -23,7 +24,15 @@ public SignedLicense Read()
             {
                 if (FileSystem.FileExists(this.fileName))
                 {
-                    this.cache = JsonConvert.DeserializeObject<SignedLicense>(FileSystem.ReadAllText(this.fileName));
+                    try
+                    {
+                        this.cache = JsonConvert.DeserializeObject<SignedLicense>(FileSystem.ReadAllText(this.fileName));
+                    }
+                    catch (Exception exception)
+                    {
+                        Logger.Warning("Could not read global license." + Environment.NewLine + exception.Message + Environment.NewLine + exception.StackTrace);
+                        this.cache = null;
+                    }
                 }
                 this.cache ??= new SignedLicense();
             }

Common/Licensing/LicenseService.cs

@@ -29,7 +29,7 @@ public void Check()
         {
             try
             {
-                Guid licenseId = this.globalSettingsService.Read().License;
+                Guid licenseId = this.globalSettingsService.Read()?.License ?? Guid.Empty;
                 SignedLicense license = this.globalLicenseService.Read();
                 if (license.License.Id == licenseId && (license.License.ValidUntil.Date - DateTime.Today).TotalDays >= 7 && license.Validate())
                 {

Common/Settings/GlobalSettingsService.cs

@@ -26,11 +26,19 @@ public GlobalSettings Read()
                 stopwatch.Start();
                 if (FileSystem.FileExists(this.fileName))
                 {
-                    this.cache = JsonConvert.DeserializeObject<GlobalSettings>(FileSystem.ReadAllText(this.fileName));
+                    try
+                    {
+                        this.cache = JsonConvert.DeserializeObject<GlobalSettings>(FileSystem.ReadAllText(this.fileName));
+                    }
+                    catch (Exception exception)
+                    {
+                        Logger.Warning("Could not read global settings." + Environment.NewLine + exception.Message + Environment.NewLine + exception.StackTrace);
+                        this.cache = null;
+                    }
                 }
-                else
+                if (this.cache == null)
                 {
-                    this.cache ??= new GlobalSettings();
+                    this.cache = new GlobalSettings();
                     this.Write();
                 }
                 stopwatch.Stop();

Reflection/Readers/ReflectionReader.cs

@@ -27,11 +27,19 @@ public void Read(ReflectionReadConfiguration configuration, IOptions caller = nu
                 Logger.Trace($"Class {configuration.Namespace}.{configuration.Name} not found");
                 return;
             }
-            ModelTransferObject selfModel = this.modelReader.Read(type, caller);
-            IOptions modelOptions = this.options.Get(selfModel);
-            if (configuration.OnlySubTypes || modelOptions.OnlySubTypes)
+            try
             {
-                modelOptions.OnlySubTypes = true;
+                ModelTransferObject selfModel = this.modelReader.Read(type, caller);
+                IOptions modelOptions = this.options.Get(selfModel);
+                if (configuration.OnlySubTypes || modelOptions.OnlySubTypes)
+                {
+                    modelOptions.OnlySubTypes = true;
+                }
+            }
+            catch
+            {
+                Logger.Warning("Reflection reader could not read " + type.FullName);
+                throw;
             }
         }
     }