Minor try catch error changes to prevent potential issues

mwatson · mwatson · commit 4bd588e78355 · 2016-09-29T10:32:38.000-05:00
diff --git a/Src/StackifyLib/Internal/Metrics/MetricClient.cs b/Src/StackifyLib/Internal/Metrics/MetricClient.cs
@@ -323,29 +323,31 @@ private static void UploadMetricsCheck(object state)
         
         public static void StopMetricsQueue(string reason = "Unknown")
         {
-            StackifyAPILogger.Log("StopMetricsQueue called by " + reason, true);
-            
-            //don't let t his method run more than once
-            if (_StopRequested)
-                return;
 
-            _StopRequested = true;
 
             try
             {
+                StackifyAPILogger.Log("StopMetricsQueue called by " + reason, true);
+
+                //don't let t his method run more than once
+                if (_StopRequested)
+                    return;
+
+                _StopRequested = true;
+
                 DateTime currentMinute = DateTime.UtcNow.AddMinutes(2).Floor(TimeSpan.FromMinutes(1));
 
                 UploadMetrics(currentMinute);
 
+                _StopRequested = false;
+                StackifyAPILogger.Log("StopMetricsQueue completed" + reason, true);
             }
             catch (Exception ex)
             {
                 StackifyAPILogger.Log("StopMetricsQueue error" + ex.ToString(), true);
             }
 
 
-            _StopRequested = false;
-            StackifyAPILogger.Log("StopMetricsQueue completed" + reason, true);
         }
 
         public static bool UploadMetrics(DateTime currentMinute)
diff --git a/Src/StackifyLib/Utils/HttpClient.cs b/Src/StackifyLib/Utils/HttpClient.cs
@@ -108,7 +108,7 @@ public HttpClient(string apiKey, string apiUrl)
             }
             _LastIdentityAttempt = DateTime.UtcNow.AddMinutes(-15);
 
-            if (!BaseAPIUrl.EndsWith("/"))
+            if (BaseAPIUrl != null && !BaseAPIUrl.EndsWith("/"))
                 BaseAPIUrl += "/";
         }
 
diff --git a/Src/StackifyLib/Utils/StackifyAPILogger.cs b/Src/StackifyLib/Utils/StackifyAPILogger.cs
@@ -48,28 +48,25 @@ public static StringWriter Logger
 
         public static void Log(string message, bool logAnyways = false)
         {
-            if (logAnyways || (_LogEnabled ?? false))
+            try
             {
-                if (OnLogMessage != null)
+                if (logAnyways || (_LogEnabled ?? false))
                 {
-                    try
+                    OnLogMessage?.Invoke("StackifyLib: " + message);
+
+                    if (_Logger != null)
                     {
-                        OnLogMessage("StackifyLib: " + message);
+                        _Logger.Write("StackifyLib: " + message);
                     }
-                    catch (Exception)
+                    else
                     {
-                        
+                        Debug.WriteLine("StackifyLib: " + message);
                     }
                 }
+            }
+            catch 
+            {
 
-                if (_Logger != null)
-                {
-                    _Logger.Write("StackifyLib: " + message);
-                }
-                else
-                {
-                    Debug.WriteLine("StackifyLib: " + message);
-                }
             }
             
         }
diff --git a/Src/StackifyLibCore.sln b/Src/StackifyLibCore.sln
@@ -13,8 +13,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NLog.Targets.Stackify", "NL
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StackifyLib.ELMAH", "StackifyLib.ELMAH\StackifyLib.ELMAH.csproj", "{D0E1AABD-6397-4CC7-9737-4904A4BF5BCD}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.Stackify", "Serilog.Sinks.Stackify\Serilog.Sinks.Stackify.xproj", "{5A144848-A7C9-4D61-A4F0-E3DAF7FBF994}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,10 +39,6 @@ Global
 		{D0E1AABD-6397-4CC7-9737-4904A4BF5BCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D0E1AABD-6397-4CC7-9737-4904A4BF5BCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D0E1AABD-6397-4CC7-9737-4904A4BF5BCD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5A144848-A7C9-4D61-A4F0-E3DAF7FBF994}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A144848-A7C9-4D61-A4F0-E3DAF7FBF994}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A144848-A7C9-4D61-A4F0-E3DAF7FBF994}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5A144848-A7C9-4D61-A4F0-E3DAF7FBF994}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Original file line number	Diff line number	Diff line change
`@@ -323,29 +323,31 @@ private static void UploadMetricsCheck(object state)`
`323`	`323`
`324`	`324`	`public static void StopMetricsQueue(string reason = "Unknown")`
`325`	`325`	`{`
`326`		`- StackifyAPILogger.Log("StopMetricsQueue called by " + reason, true);`
`327`		`-`
`328`		`- //don't let t his method run more than once`
`329`		`- if (_StopRequested)`
`330`		`- return;`
`331`	`326`
`332`		`- _StopRequested = true;`
`333`	`327`
`334`	`328`	`try`
`335`	`329`	`{`
	`330`	`+ StackifyAPILogger.Log("StopMetricsQueue called by " + reason, true);`
	`331`	`+`
	`332`	`+ //don't let t his method run more than once`
	`333`	`+ if (_StopRequested)`
	`334`	`+ return;`
	`335`	`+`
	`336`	`+ _StopRequested = true;`
	`337`	`+`
`336`	`338`	`DateTime currentMinute = DateTime.UtcNow.AddMinutes(2).Floor(TimeSpan.FromMinutes(1));`
`337`	`339`
`338`	`340`	`UploadMetrics(currentMinute);`
`339`	`341`
	`342`	`+ _StopRequested = false;`
	`343`	`+ StackifyAPILogger.Log("StopMetricsQueue completed" + reason, true);`
`340`	`344`	`}`
`341`	`345`	`catch (Exception ex)`
`342`	`346`	`{`
`343`	`347`	`StackifyAPILogger.Log("StopMetricsQueue error" + ex.ToString(), true);`
`344`	`348`	`}`
`345`	`349`
`346`	`350`
`347`		`- _StopRequested = false;`
`348`		`- StackifyAPILogger.Log("StopMetricsQueue completed" + reason, true);`
`349`	`351`	`}`
`350`	`352`
`351`	`353`	`public static bool UploadMetrics(DateTime currentMinute)`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public HttpClient(string apiKey, string apiUrl)`
`108`	`108`	`}`
`109`	`109`	`_LastIdentityAttempt = DateTime.UtcNow.AddMinutes(-15);`
`110`	`110`
`111`		`- if (!BaseAPIUrl.EndsWith("/"))`
	`111`	`+ if (BaseAPIUrl != null && !BaseAPIUrl.EndsWith("/"))`
`112`	`112`	`BaseAPIUrl += "/";`
`113`	`113`	`}`
`114`	`114`
Original file line number	Diff line number	Diff line change
`@@ -48,28 +48,25 @@ public static StringWriter Logger`
`48`	`48`
`49`	`49`	`public static void Log(string message, bool logAnyways = false)`
`50`	`50`	`{`
`51`		`- if (logAnyways \|\| (_LogEnabled ?? false))`
	`51`	`+ try`
`52`	`52`	`{`
`53`		`- if (OnLogMessage != null)`
	`53`	`+ if (logAnyways \|\| (_LogEnabled ?? false))`
`54`	`54`	`{`
`55`		`- try`
	`55`	`+ OnLogMessage?.Invoke("StackifyLib: " + message);`
	`56`	`+`
	`57`	`+ if (_Logger != null)`
`56`	`58`	`{`
`57`		`- OnLogMessage("StackifyLib: " + message);`
	`59`	`+ _Logger.Write("StackifyLib: " + message);`
`58`	`60`	`}`
`59`		`- catch (Exception)`
	`61`	`+ else`
`60`	`62`	`{`
`61`		`-`
	`63`	`+ Debug.WriteLine("StackifyLib: " + message);`
`62`	`64`	`}`
`63`	`65`	`}`
	`66`	`+ }`
	`67`	`+ catch`
	`68`	`+ {`
`64`	`69`
`65`		`- if (_Logger != null)`
`66`		`- {`
`67`		`- _Logger.Write("StackifyLib: " + message);`
`68`		`- }`
`69`		`- else`
`70`		`- {`
`71`		`- Debug.WriteLine("StackifyLib: " + message);`
`72`		`- }`
`73`	`70`	`}`
`74`	`71`
`75`	`72`	`}`