shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

core: code cleanup, exception messages (#9631)

Browse Source
This commit is contained in:
Diego Heras
2020-09-24 22:02:45 +02:00
committed by GitHub
parent 39f7add32b
commit b212169dc2
11 changed files with 180 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Jackett.Server/Program.cs
View File

@@ -40,7 +40,6 @@ namespace Jackett.Server
text.Heading = "Jackett v" + EnvironmentUtil.JackettVersion;
Console.WriteLine(text);
Environment.Exit(1);
return;
});
optionsResult.WithParsed(options =>
@@ -67,7 +66,7 @@ namespace Jackett.Server
}
catch (Exception e)
{
logger.Error(e, "Error while creating the PID file");
logger.Error($"Error while creating the PID file\n{e}");
}
}
@@ -89,7 +88,7 @@ namespace Jackett.Server
}
else
{
logger.Error($"ReserveUrls and service arguments only apply to Windows, please remove them from your start arguments");
logger.Error("ReserveUrls and service arguments only apply to Windows, please remove them from your start arguments");
Environment.Exit(1);
}
}
@@ -125,14 +124,14 @@ namespace Jackett.Server
CreateWebHostBuilder(args, url, applicationFolder).Build().Run();
}
catch (Exception ex)
catch (Exception e)
{
if (ex.InnerException is Microsoft.AspNetCore.Connections.AddressInUseException)
if (e.InnerException is Microsoft.AspNetCore.Connections.AddressInUseException)
{
logger.Error("Address already in use: Most likely Jackett is already running. " + ex.Message);
logger.Error($"Address already in use: Most likely Jackett is already running. {e.Message}");
Environment.Exit(1);
}
logger.Error(ex);
logger.Error(e);
throw;
}
} while (isWebHostRestart);
@@ -152,11 +151,11 @@ namespace Jackett.Server
{
if (Settings != null && !string.IsNullOrWhiteSpace(Settings.PIDFile))
{
var PIDFile = Settings.PIDFile;
if (File.Exists(PIDFile))
var pidFile = Settings.PIDFile;
if (File.Exists(pidFile))
{
Console.WriteLine("Deleting PID file " + PIDFile);
File.Delete(PIDFile);
Console.WriteLine("Deleting PID file " + pidFile);
File.Delete(pidFile);
}
LogManager.Shutdown();
}