Some logging changes

This commit is contained in:
zone117x
2015-04-22 20:04:57 -06:00
parent 012cec3a8b
commit 0530bed226

View File

@@ -60,29 +60,33 @@ namespace Jackett
} }
catch (HttpListenerException ex) catch (HttpListenerException ex)
{ {
Console.WriteLine("Server start exception: " + ex.ToString()); var errorStr = "App must be ran as Admin for permission to use port "
var dialogResult = MessageBox.Show( + Port + Environment.NewLine
"App must be ran as Admin for permission to use port " + Port + Environment.NewLine + "Restart app with admin privileges?", + "Restart app with admin privileges?";
"Failed to open port",
MessageBoxButtons.YesNo Program.LoggerInstance.FatalException("Failed to start HTTP server", ex);
);
if (dialogResult == DialogResult.No) if (Environment.OSVersion.Platform == PlatformID.Win32NT)
{ {
Program.LoggerInstance.FatalException("App must be ran as Admin for permission to use port " + Port, ex); var dialogResult = MessageBox.Show(errorStr, "Error", MessageBoxButtons.YesNo);
Application.Exit(); if (dialogResult == DialogResult.No)
return; {
} Program.LoggerInstance.FatalException("App must be ran as Admin for permission to use port " + Port, ex);
else Application.Exit();
{ return;
Program.RestartAsAdmin(); }
else
{
Program.RestartAsAdmin();
}
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.WriteLine("Server start exception: " + ex.ToString()); Program.LoggerInstance.ErrorException("Error starting HTTP server: " + ex.Message, ex);
Program.LoggerInstance.ErrorException("Error: " + ex.Message, ex);
return; return;
} }
Program.LoggerInstance.Info("Server started on port " + Port); Program.LoggerInstance.Info("Server started on port " + Port);
try try
@@ -95,9 +99,18 @@ namespace Jackett
while (true) while (true)
{ {
var context = await listener.GetContextAsync(); try
ProcessHttpRequest(context); {
var context = await listener.GetContextAsync();
ProcessHttpRequest(context);
}
catch (Exception ex)
{
Program.LoggerInstance.ErrorException("Error processing HTTP request", ex);
}
} }
Program.LoggerInstance.Debug("HTTP request servicer thread died");
} }
public void Stop() public void Stop()