More logging during output process

pull/3113/head
Mark McDowall 11 years ago
parent 545bc756f2
commit f2da193ef7

@ -53,19 +53,7 @@ namespace NzbDrone.Update
public void Start(string[] args) public void Start(string[] args)
{ {
var startupContext = ParseArgs(args); var startupContext = ParseArgs(args);
string targetFolder; var targetFolder = GetInstallationDirectory(startupContext);
if (startupContext.ExecutingApplication.IsNullOrWhiteSpace())
{
var exeFileInfo = new FileInfo(_processProvider.GetProcessById(startupContext.ProcessId).StartPath);
targetFolder = exeFileInfo.Directory.FullName;
}
else
{
var exeFileInfo = new FileInfo(startupContext.ExecutingApplication);
targetFolder = exeFileInfo.Directory.FullName;
}
logger.Info("Starting update process. Target Path:{0}", targetFolder); logger.Info("Starting update process. Target Path:{0}", targetFolder);
_installUpdateService.Start(targetFolder, startupContext.ProcessId); _installUpdateService.Start(targetFolder, startupContext.ProcessId);
@ -122,5 +110,26 @@ namespace NzbDrone.Update
logger.Debug("NzbDrone process ID: {0}", id); logger.Debug("NzbDrone process ID: {0}", id);
return id; return id;
} }
private string GetInstallationDirectory(UpdateStartupContext startupContext)
{
if (startupContext.ExecutingApplication.IsNullOrWhiteSpace())
{
logger.Debug("Using process ID to find installation directory: {0}", startupContext.ProcessId);
var exeFileInfo = new FileInfo(_processProvider.GetProcessById(startupContext.ProcessId).StartPath);
logger.Debug("Executable location: {0}", exeFileInfo.FullName);
return exeFileInfo.DirectoryName;
}
else
{
logger.Debug("Using executing application: {0}", startupContext.ExecutingApplication);
var exeFileInfo = new FileInfo(startupContext.ExecutingApplication);
logger.Debug("Executable location: {0}", exeFileInfo.FullName);
return exeFileInfo.DirectoryName;
}
}
} }
} }

Loading…
Cancel
Save