Reduce exception dump in console

muratcakir · muratcakir · commit 4d70917537fc · 2019-04-02T03:20:27.000+02:00
diff --git a/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLogger.cs b/src/Libraries/SmartStore.Core/Logging/log4net/Log4netLogger.cs
@@ -75,10 +75,14 @@ public void Log(LogLevel level, Exception exception, string message, object[] ar
 		protected internal void TryAddExtendedThreadInfo(LoggingEvent loggingEvent)
 		{
 			HttpRequest httpRequest = null;
+			bool httpRequestReady = HttpContext.Current?.Handler != null;
 
 			try
 			{
-				httpRequest = HttpContext.Current.Request;
+				if (httpRequestReady)
+				{
+					httpRequest = HttpContext.Current.Request;
+				}		
 			}
 			catch
 			{
@@ -104,10 +108,9 @@ protected internal void TryAddExtendedThreadInfo(LoggingEvent loggingEvent)
 					{
 						var container = EngineContext.Current.ContainerManager;
 
-						IWorkContext workContext;
 
 						// CustomerId
-						if (container.TryResolve<IWorkContext>(null, out workContext))
+						if (container.TryResolve<IWorkContext>(null, out IWorkContext workContext))
 						{
 							try
 							{
@@ -119,10 +122,9 @@ protected internal void TryAddExtendedThreadInfo(LoggingEvent loggingEvent)
 							}
 						}
 
-						IWebHelper webHelper;
 
 						// Url & stuff
-						if (container.TryResolve<IWebHelper>(null, out webHelper))
+						if (container.TryResolve<IWebHelper>(null, out IWebHelper webHelper))
 						{
 							try
 							{
diff --git a/src/Libraries/SmartStore.Core/WebHelper.cs b/src/Libraries/SmartStore.Core/WebHelper.cs
@@ -182,12 +182,9 @@ public virtual string ServerVariables(string name)
 
             try
             {
-				if (_httpContext != null && _httpContext.Request != null)
+				if (_httpContext.Handler != null && _httpContext?.Request?.ServerVariables[name] != null)
 				{
-					if (_httpContext.Request.ServerVariables[name] != null)
-					{
-						result = _httpContext.Request.ServerVariables[name];
-					}
+					result = _httpContext.Request.ServerVariables[name];
 				}
             }
             catch
diff --git a/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs b/src/Libraries/SmartStore.Services/Cms/LinkResolver.cs
@@ -228,8 +228,16 @@ protected virtual LinkResolverData Parse(string linkExpression)
 						case LinkType.Category:
 						case LinkType.Manufacturer:
 						case LinkType.Topic:
-							var id = path.ToInt();
-							result.Value = id != 0 ? (object)id : path;
+							if (int.TryParse(path, out var id))
+							{
+								// Reduce thrown exceptions in console
+								result.Value = id;
+							}
+							else
+							{
+								result.Value = path;
+							}
+
 							result.QueryString = query;
 							break;
 						case LinkType.Url:
diff --git a/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs b/src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs
@@ -724,15 +724,15 @@ static HttpContextBase HttpContextBaseFactory(IComponentContext ctx)
 
 		static bool IsRequestValid()
 		{
-			if (HttpContext.Current == null)
+			if (HttpContext.Current?.Handler == null)
 				return false;
 
 			try
 			{
 				// The "Request" property throws at application startup on IIS integrated pipeline mode
 				var req = HttpContext.Current.Request;
 			}
-			catch (Exception)
+			catch
 			{
 				return false;
 			}
diff --git a/src/Presentation/SmartStore.Web.Framework/Extensions/HttpExtensions.cs b/src/Presentation/SmartStore.Web.Framework/Extensions/HttpExtensions.cs
@@ -215,10 +215,10 @@ internal static void SetUserThemeChoiceInCookie(this HttpContextBase context, st
 
 		internal static HttpCookie GetPreviewModeCookie(this HttpContextBase context, bool createIfMissing)
 		{
-			if (context == null)
+			if (context?.Handler == null)
 				return null;
 
-			var cookie = context.Request.Cookies.Get("sm.PreviewModeOverrides");
+			var cookie = context.Request?.Cookies?.Get("sm.PreviewModeOverrides");
 			
 			if (cookie == null && createIfMissing)
 			{
diff --git a/src/Presentation/SmartStore.Web.Framework/Theming/ThemeContext.cs b/src/Presentation/SmartStore.Web.Framework/Theming/ThemeContext.cs
@@ -147,7 +147,7 @@ public string GetRequestTheme()
 		{
 			try
 			{
-				return (string)_httpContext.Request.RequestContext.RouteData.DataTokens[OverriddenThemeNameKey];
+				return (string)_httpContext.Request?.RequestContext?.RouteData?.DataTokens[OverriddenThemeNameKey];
 			}
 			catch
 			{
diff --git a/src/Presentation/SmartStore.Web.Framework/WebStoreContext.cs b/src/Presentation/SmartStore.Web.Framework/WebStoreContext.cs
@@ -52,7 +52,11 @@ public void SetRequestStore(int? storeId)
 		{
 			try
 			{
-				var value = _httpContext.Request.RequestContext.RouteData?.DataTokens?.Get(OverriddenStoreIdKey);
+				// Reduce thrown exceptions in console
+				if (_httpContext.Handler == null)
+					return null;
+
+				var value = _httpContext.Request?.RequestContext?.RouteData?.DataTokens?.Get(OverriddenStoreIdKey);
 				if (value != null)
 				{
 					return (int)value;

Original file line number	Diff line number	Diff line change
`@@ -75,10 +75,14 @@ public void Log(LogLevel level, Exception exception, string message, object[] ar`
`75`	`75`	`protected internal void TryAddExtendedThreadInfo(LoggingEvent loggingEvent)`
`76`	`76`	`{`
`77`	`77`	`HttpRequest httpRequest = null;`
	`78`	`+ bool httpRequestReady = HttpContext.Current?.Handler != null;`
`78`	`79`
`79`	`80`	`try`
`80`	`81`	`{`
`81`		`- httpRequest = HttpContext.Current.Request;`
	`82`	`+ if (httpRequestReady)`
	`83`	`+ {`
	`84`	`+ httpRequest = HttpContext.Current.Request;`
	`85`	`+ }`
`82`	`86`	`}`
`83`	`87`	`catch`
`84`	`88`	`{`
`@@ -104,10 +108,9 @@ protected internal void TryAddExtendedThreadInfo(LoggingEvent loggingEvent)`
`104`	`108`	`{`
`105`	`109`	`var container = EngineContext.Current.ContainerManager;`
`106`	`110`
`107`		`- IWorkContext workContext;`
`108`	`111`
`109`	`112`	`// CustomerId`
`110`		`- if (container.TryResolve<IWorkContext>(null, out workContext))`
	`113`	`+ if (container.TryResolve<IWorkContext>(null, out IWorkContext workContext))`
`111`	`114`	`{`
`112`	`115`	`try`
`113`	`116`	`{`
`@@ -119,10 +122,9 @@ protected internal void TryAddExtendedThreadInfo(LoggingEvent loggingEvent)`
`119`	`122`	`}`
`120`	`123`	`}`
`121`	`124`
`122`		`- IWebHelper webHelper;`
`123`	`125`
`124`	`126`	`// Url & stuff`
`125`		`- if (container.TryResolve<IWebHelper>(null, out webHelper))`
	`127`	`+ if (container.TryResolve<IWebHelper>(null, out IWebHelper webHelper))`
`126`	`128`	`{`
`127`	`129`	`try`
`128`	`130`	`{`
Original file line number	Diff line number	Diff line change
`@@ -182,12 +182,9 @@ public virtual string ServerVariables(string name)`
`182`	`182`
`183`	`183`	`try`
`184`	`184`	`{`
`185`		`- if (_httpContext != null && _httpContext.Request != null)`
	`185`	`+ if (_httpContext.Handler != null && _httpContext?.Request?.ServerVariables[name] != null)`
`186`	`186`	`{`
`187`		`- if (_httpContext.Request.ServerVariables[name] != null)`
`188`		`- {`
`189`		`- result = _httpContext.Request.ServerVariables[name];`
`190`		`- }`
	`187`	`+ result = _httpContext.Request.ServerVariables[name];`
`191`	`188`	`}`
`192`	`189`	`}`
`193`	`190`	`catch`
Original file line number	Diff line number	Diff line change
`@@ -724,15 +724,15 @@ static HttpContextBase HttpContextBaseFactory(IComponentContext ctx)`
`724`	`724`
`725`	`725`	`static bool IsRequestValid()`
`726`	`726`	`{`
`727`		`- if (HttpContext.Current == null)`
	`727`	`+ if (HttpContext.Current?.Handler == null)`
`728`	`728`	`return false;`
`729`	`729`
`730`	`730`	`try`
`731`	`731`	`{`
`732`	`732`	`// The "Request" property throws at application startup on IIS integrated pipeline mode`
`733`	`733`	`var req = HttpContext.Current.Request;`
`734`	`734`	`}`
`735`		`- catch (Exception)`
	`735`	`+ catch`
`736`	`736`	`{`
`737`	`737`	`return false;`
`738`	`738`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,10 +215,10 @@ internal static void SetUserThemeChoiceInCookie(this HttpContextBase context, st`
`215`	`215`
`216`	`216`	`internal static HttpCookie GetPreviewModeCookie(this HttpContextBase context, bool createIfMissing)`
`217`	`217`	`{`
`218`		`- if (context == null)`
	`218`	`+ if (context?.Handler == null)`
`219`	`219`	`return null;`
`220`	`220`
`221`		`- var cookie = context.Request.Cookies.Get("sm.PreviewModeOverrides");`
	`221`	`+ var cookie = context.Request?.Cookies?.Get("sm.PreviewModeOverrides");`
`222`	`222`
`223`	`223`	`if (cookie == null && createIfMissing)`
`224`	`224`	`{`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public string GetRequestTheme()`
`147`	`147`	`{`
`148`	`148`	`try`
`149`	`149`	`{`
`150`		`- return (string)_httpContext.Request.RequestContext.RouteData.DataTokens[OverriddenThemeNameKey];`
	`150`	`+ return (string)_httpContext.Request?.RequestContext?.RouteData?.DataTokens[OverriddenThemeNameKey];`
`151`	`151`	`}`
`152`	`152`	`catch`
`153`	`153`	`{`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,11 @@ public void SetRequestStore(int? storeId)`
`52`	`52`	`{`
`53`	`53`	`try`
`54`	`54`	`{`
`55`		`- var value = _httpContext.Request.RequestContext.RouteData?.DataTokens?.Get(OverriddenStoreIdKey);`
	`55`	`+ // Reduce thrown exceptions in console`
	`56`	`+ if (_httpContext.Handler == null)`
	`57`	`+ return null;`
	`58`	`+`
	`59`	`+ var value = _httpContext.Request?.RequestContext?.RouteData?.DataTokens?.Get(OverriddenStoreIdKey);`
`56`	`60`	`if (value != null)`
`57`	`61`	`{`
`58`	`62`	`return (int)value;`