7.0.14 release

     - [ENHANCEMENT] updated code to allow application pool to start if memcache is unavailable
     - [ENHANCEMENT] removed ApplicationLoaded flag from api as if there is no API config loaded on application startup then let an exception be thrown that is not caught
     - [ENHANCEMENT] updated ICacheConfig to allow API_MEMCACHED_ENABLED to be set in Code
     - [ENHANCEMENT] updated MemCacheD constructor to have the stats query within try catch Block
     - [ENHANCEMENT] updated ConsoleConfiguration.cs to remove ApplicationLoaded flag
     - [BUG FIX] updated ReadJSONSettings to return null if the version that is being looked for is not there

Author: lanesCSO

rls/packages/API.Library.7.0.14.nupkg

@@ -12,12 +12,17 @@
     <PackageId>API.Library</PackageId>
     <Product>API Library</Product>
     <Copyright>Central Statistics Office, Ireland</Copyright>
-    <Version>7.0.13</Version>
+    <Version>7.0.14</Version>
     <Authors>Central Statistics Office, Ireland</Authors>
     <SignAssembly>False</SignAssembly>
     <RepositoryUrl>https://github.com/CSOIreland/Server-API-Library</RepositoryUrl>
     <PackageReleaseNotes>
-      - [LIBRARY UPDATE] upgraded microsoft.data.sqlclient to 5.2.2  
+      - [ENHANCEMENT] updated code to allow application pool to start if memcache is unavailable
+      - [ENHANCEMENT] removed ApplicationLoaded flag from api as if there is no API config loaded on application startup then let an exception be thrown that is not caught
+      - [ENHANCEMENT] updated ICacheConfig to allow API_MEMCACHED_ENABLED to be set in Code
+      - [ENHANCEMENT] updated MemCacheD constructor to have the stats query within try catch Block
+      - [ENHANCEMENT] updated ConsoleConfiguration.cs to remove ApplicationLoaded flag
+      - [BUG FIX] updated ReadJSONSettings to return null if the version that is being looked for is not there
     </PackageReleaseNotes>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     <RestoreLockedMode>true</RestoreLockedMode>
@@ -36,6 +41,7 @@
 	  <None Remove="Entities\MemCacheD.cs~RFcba3198.TMP" />
 	  <None Remove="Entities\MethodReader.cs~RF8645ca5e.TMP" />
 	  <None Remove="log4net.config" />
+	  <None Remove="Middleware\ServiceConfiguration.cs~RF1c6e307d.TMP" />
 	</ItemGroup>
 
 	<ItemGroup>

src/API.Library/API.Library.csproj

@@ -37,6 +37,9 @@ public bool API_MEMCACHED_ENABLED
             {
                 return _CacheSettingsDelegate.CurrentValue.API_MEMCACHED_ENABLED;
             }
+            set{
+                _CacheSettingsDelegate.CurrentValue.API_MEMCACHED_ENABLED = value;
+            }
         }
 
         public bool API_CACHE_TRACE_ENABLED

src/API.Library/Config/CacheConfig.cs

@@ -88,6 +88,7 @@ public static IDictionary<string, string> ReadJSONSettings(decimal? inMemoryVers
                             if (inMemoryVersion != Convert.ToDecimal(val.Value))
                             {
                                 Log.Instance.Fatal("" + ConfigType + " : Configuration version not found for version " + inMemoryVersion);
+                                return null;
                             }
                         }
                         if (dictionary.ContainsKey(val.Key))

src/API.Library/Config/CommonConfig.cs

@@ -97,16 +97,21 @@ public static IHost AddApiLibrary(IConfiguration configuration)
             ApiServicesHelper.ApiConfiguration = builder.Services.GetService<IApiConfiguration>();
             if (ApiServicesHelper.ApiConfiguration.Settings == null)
             {
-                ApiServicesHelper.ApplicationLoaded = false;
+                throw new Exception("API Settings failed to load");
             }
 
             ApiServicesHelper.WebUtility = builder.Services.GetService<IWebUtility> ();
             ApiServicesHelper.ActiveDirectory = builder.Services.GetService<IActiveDirectory>();
 
-            if (ApiServicesHelper.APPConfig.enabled && ApiServicesHelper.ApplicationLoaded)
+            if (ApiServicesHelper.APPConfig.enabled)
             {
                 //load APP config here as if can't load application wont work
                 ApiServicesHelper.AppConfiguration = builder.Services.GetService<IAppConfiguration>();
+
+                if (ApiServicesHelper.AppConfiguration.Settings == null)
+                {
+                    throw new Exception("APP Settings failed to load");
+                }
             }
 
             Log.Instance.Info("All API setup completed");

src/API.Library/Console/ConsoleConfiguration.cs

@@ -33,17 +33,15 @@ public MemCacheD()
                 var port = ApiServicesHelper.Configuration.GetSection("enyimMemcached:Servers:0:Port").Value;
                 var address = ApiServicesHelper.Configuration.GetSection("enyimMemcached:Servers:0:Address").Value;
 
-                ServerStats stats = ApiServicesHelper.MemcachedClient.Stats();
-
                 try
                 {
+                    ServerStats stats = ApiServicesHelper.MemcachedClient.Stats();            
                     var upTime = stats.GetUptime(new IPEndPoint(IPAddress.Parse(address), int.Parse(port)));
                 }
                 catch (Exception ex)
                 {
                     Log.Instance.Fatal(ex);
                     Log.Instance.Fatal("Memcache has not returned any stats data. Memcache may be unavailable");
-
                 }
             }
         }

src/API.Library/Entities/MemCacheD.cs

@@ -27,7 +27,7 @@ internal static DataTable CreateDatabaseTraceDataTable()
         internal static  void PopulateDatabaseTrace(string procedure, string procedureParams, DateTime startTime, decimal duration, string action, bool success)
         {
             //dont record tracing unless apiconfiguration has been loaded and their is a correlation id
-            if (ApiServicesHelper.ApplicationLoaded && ApiServicesHelper.ApiConfiguration != null && APIMiddleware.correlationID.Value != null && APIMiddleware.databaseTraceDataTable.Value != null)
+            if (ApiServicesHelper.ApiConfiguration != null && APIMiddleware.correlationID.Value != null && APIMiddleware.databaseTraceDataTable.Value != null)
             {
                 try
                 {

src/API.Library/Entities/Tracing/DatabaseTrace/DatabaseTrace.cs

@@ -5,7 +5,7 @@ public interface ICacheConfig
         string API_MEMCACHED_SALSA { get;  }
         uint API_MEMCACHED_MAX_VALIDITY { get;  }
         uint API_MEMCACHED_MAX_SIZE { get; }
-        bool API_MEMCACHED_ENABLED { get; }
+        bool API_MEMCACHED_ENABLED { get; set; }
         bool API_CACHE_TRACE_ENABLED { get; }
 
     }

src/API.Library/Interfaces/ICacheConfig.cs

@@ -28,17 +28,10 @@ public async Task InvokeAsync(HttpContext context)
             //set asynclocal value
             correlationID.Value = activity.RootId.ToString();
 
-            if (!ApiServicesHelper.ApplicationLoaded)
-            {
-                Log.Instance.Fatal("No API configuration loaded.");
-                context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
-                await context.Response.WriteAsync("");
-            }
-            else
-            {
-                Trace trace = new Trace();
-
-                if (ApiServicesHelper.ApiConfiguration.API_TRACE_ENABLED)
+           
+            Trace trace = new Trace();
+
+           if (ApiServicesHelper.ApiConfiguration.API_TRACE_ENABLED)
                 {
                     trace.TrcStartTime = DateTime.Now;
                     trace.TrcCorrelationID = activity.RootId;
@@ -52,30 +45,27 @@ public async Task InvokeAsync(HttpContext context)
 
                 }
 
-                // Start the activity Stopwatch
-                activity.Start();
+           // Start the activity Stopwatch
+           activity.Start();
 
 
-                Log.Instance.Info("API Interface Opened");
+           Log.Instance.Info("API Interface Opened");
 
-                // Thread a PerfomanceCollector
+           // Thread a PerfomanceCollector
 
-                /// <summary>
+           /// <summary>
                 /// Flag to indicate if Performance is enabled 
                 /// </summary>
-                bool API_PERFORMANCE_ENABLED = ApiServicesHelper.APIPerformanceSettings.API_PERFORMANCE_ENABLED;
+           bool API_PERFORMANCE_ENABLED = ApiServicesHelper.APIPerformanceSettings.API_PERFORMANCE_ENABLED;
 
-                Log.Instance.Info("Performance Enabled: " + API_PERFORMANCE_ENABLED);
+           Log.Instance.Info("Performance Enabled: " + API_PERFORMANCE_ENABLED);
 
-                //makes sure always disposed
-                using var performanceCollector = new PerformanceCollector();
-                using var cancelPerformance = new CancellationTokenSource();
-                using var apiCancellationToken = new CancellationTokenSource();
+           //makes sure always disposed
+           using var performanceCollector = new PerformanceCollector();
+           using var cancelPerformance = new CancellationTokenSource();
+           using var apiCancellationToken = new CancellationTokenSource();
 
-                try
-                {
-                  
-                    
+           try{   
                     Thread performanceThread = new Thread(() =>
                     {
                         try
@@ -266,20 +256,13 @@ public async Task InvokeAsync(HttpContext context)
                             await returnResponseAsync(context, "", apiCancellationToken, HttpStatusCode.BadRequest);
                             break;
                     }
-                }
-                catch (OperationCanceledException e)
-                {
-                    //don't need to do anything here as operation has been cancelled
-                }
-                catch (Exception ex)
-                {
-                    Log.Instance.Fatal(ex);
-                    await returnResponseAsync(context, "", apiCancellationToken, HttpStatusCode.InternalServerError);
-                }
-                finally
-                {
-                    try
-                    {
+           }catch (OperationCanceledException e){
+             //don't need to do anything here as operation has been cancelled
+           }catch (Exception ex){
+                Log.Instance.Fatal(ex);
+                await returnResponseAsync(context, "", apiCancellationToken, HttpStatusCode.InternalServerError);
+           }finally{
+                try{
 
                         if (context.Response.StatusCode != (int)HttpStatusCode.NotModified)
                         {
@@ -339,15 +322,12 @@ public async Task InvokeAsync(HttpContext context)
                             databaseTraceDataTable.Value.Dispose();
                             databaseTraceDataTable.Value = null;
                         }
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.Instance.Error("Something went wrong after response sent");
-                        Log.Instance.Error(ex);
-                    }
-
+                }catch (Exception ex){
+                    Log.Instance.Error("Something went wrong after response sent");
+                    Log.Instance.Error(ex);
                 }
-            }
+
+           }
         }
     }
 }

src/API.Library/Middleware/API.Middleware.cs

@@ -7,10 +7,6 @@ namespace API
 {
     public class ApiServicesHelper
     {
-        /// <summary>
-        /// indicator to indicate if the api config has loaded successfully
-        /// </summary>
-        public static bool ApplicationLoaded { get; set; } = true;
         public static IConfiguration Configuration { get; set; }
         public static ServiceProvider ServiceProvider { get; set; }