Merge pull request #17 from AkosLukacs/master

In IIS integrated mode Elmah fails at application start (Can't access HttpContext.Current.Request)

Author: mythz

src/.nuget/NuGet.exe

@@ -43,37 +43,67 @@ public void DebugFormat(string format, params object[] args)
 
 		public void Error(object message, Exception exception)
 		{
-			ErrorLog.GetDefault(HttpContext.Current).Log(new Error(exception, HttpContext.Current));
+			try {
+				ErrorLog.GetDefault(HttpContext.Current).Log(new Error(exception, HttpContext.Current));
+			}
+			catch {
+				ErrorLog.GetDefault(null).Log(new Error(exception));
+			}
 			log.Error(message, exception);
 		}
 
 		public void Error(object message)
 		{
-			ErrorLog.GetDefault(HttpContext.Current).Log(new Error(new System.ApplicationException(message.ToString()), HttpContext.Current));
+			try {
+				ErrorLog.GetDefault(HttpContext.Current).Log(new Error(new System.ApplicationException(message.ToString()), HttpContext.Current));
+			}
+			catch {
+				ErrorLog.GetDefault(null).Log(new Error(new System.ApplicationException(message.ToString())));
+			}
 			log.Error(message);
 		}
 
 		public void ErrorFormat(string format, params object[] args)
 		{
-			ErrorLog.GetDefault(HttpContext.Current).Log(new Error(new System.ApplicationException(string.Format(format, args)), HttpContext.Current));
+			try {
+				ErrorLog.GetDefault(HttpContext.Current).Log(new Error(new System.ApplicationException(string.Format(format, args)), HttpContext.Current));
+			}
+			catch {
+				ErrorLog.GetDefault(null).Log(new Error(new System.ApplicationException(string.Format(format, args))));
+			}
 			log.ErrorFormat(format, args);
 		}
 
 		public void Fatal(object message, Exception exception)
 		{
-			ErrorLog.GetDefault(HttpContext.Current).Log(new Error(exception, HttpContext.Current));
+			try {
+				ErrorLog.GetDefault(HttpContext.Current).Log(new Error(exception, HttpContext.Current));
+			}
+			catch {
+				ErrorLog.GetDefault(null).Log(new Error(exception));
+			}
 			log.Fatal(message, exception);
 		}
 
 		public void Fatal(object message)
 		{
-			ErrorLog.GetDefault(HttpContext.Current).Log(new Error(new System.ApplicationException(message.ToString()), HttpContext.Current));
+			try {
+				ErrorLog.GetDefault(HttpContext.Current).Log(new Error(new System.ApplicationException(message.ToString()), HttpContext.Current));
+			}
+			catch {
+				ErrorLog.GetDefault(null).Log(new Error(new System.ApplicationException(message.ToString())));
+			}
 			log.Fatal(message);
 		}
 
 		public void FatalFormat(string format, params object[] args)
 		{
-			ErrorLog.GetDefault(HttpContext.Current).Log(new Error(new System.ApplicationException(string.Format(format, args)), HttpContext.Current));
+			try {
+				ErrorLog.GetDefault(HttpContext.Current).Log(new Error(new System.ApplicationException(string.Format(format, args)), HttpContext.Current));
+			}
+			catch {
+				ErrorLog.GetDefault(null).Log(new Error(new System.ApplicationException(string.Format(format, args))));
+			}
 			log.FatalFormat(format, args);
 		}