diff options
| author | Wouter Tinus <wouter.tinus@gmail.com> | 2020-10-02 05:33:57 +0200 |
|---|---|---|
| committer | Wouter Tinus <wouter.tinus@gmail.com> | 2020-10-02 05:33:57 +0200 |
| commit | eae6ef96d3b760825da428266d1cf3ff259c448f (patch) | |
| tree | bfc8a985a95f8b91d074b3fa734dc663bd9751c3 | |
| parent | eb14ad9e14b1397c5c2eee8f5b740be5d851825e (diff) | |
| download | letsencrypt-win-simple-eae6ef96d3b760825da428266d1cf3ff259c448f.zip letsencrypt-win-simple-eae6ef96d3b760825da428266d1cf3ff259c448f.tar.gz letsencrypt-win-simple-eae6ef96d3b760825da428266d1cf3ff259c448f.tar.bz2 | |
make sure exitcode is set when a renewal failed
| -rw-r--r-- | src/main.lib/RenewalManager.cs | 17 | ||||
| -rw-r--r-- | src/main.lib/Services/ExceptionHandler.cs | 2 | ||||
| -rw-r--r-- | src/main/Program.cs | 2 |
3 files changed, 14 insertions, 7 deletions
diff --git a/src/main.lib/RenewalManager.cs b/src/main.lib/RenewalManager.cs index e563d78..c435cfb 100644 --- a/src/main.lib/RenewalManager.cs +++ b/src/main.lib/RenewalManager.cs @@ -164,7 +164,7 @@ namespace PKISharp.WACS if (_args.Force) { runLevel |= RunLevel.IgnoreCache; - } + }
await ProcessRenewal(renewal, runLevel); } }, @@ -467,7 +467,12 @@ namespace PKISharp.WACS { try { - await ProcessRenewal(renewal, runLevel); + var success = await ProcessRenewal(renewal, runLevel);
+ if (!success)
+ {
+ // Make sure the ExitCode is set
+ _exceptionHandler.HandleException();
+ } } catch (Exception ex) { @@ -482,7 +487,7 @@ namespace PKISharp.WACS /// Process a single renewal /// </summary> /// <param name="renewal"></param> - internal async Task ProcessRenewal(Renewal renewal, RunLevel runLevel) + internal async Task<bool> ProcessRenewal(Renewal renewal, RunLevel runLevel) { var notification = _container.Resolve<NotificationService>(); try @@ -493,7 +498,8 @@ namespace PKISharp.WACS _renewalStore.Save(renewal, result); if (result.Success) { - await notification.NotifySuccess(renewal, _log.Lines); + await notification.NotifySuccess(renewal, _log.Lines);
+ return true; } else { @@ -505,7 +511,8 @@ namespace PKISharp.WACS { _exceptionHandler.HandleException(ex); await notification.NotifyFailure(runLevel, renewal, new List<string> { ex.Message }, _log.Lines); - } + }
+ return false; } /// <summary> diff --git a/src/main.lib/Services/ExceptionHandler.cs b/src/main.lib/Services/ExceptionHandler.cs index ca54ee9..0ab6cb7 100644 --- a/src/main.lib/Services/ExceptionHandler.cs +++ b/src/main.lib/Services/ExceptionHandler.cs @@ -74,8 +74,8 @@ namespace PKISharp.WACS.Services else if (!string.IsNullOrEmpty(message)) { _log.Error(message); - ExitCode = -1; } + ExitCode = -1; return outMessage; } diff --git a/src/main/Program.cs b/src/main/Program.cs index 948f10b..09892e3 100644 --- a/src/main/Program.cs +++ b/src/main/Program.cs @@ -31,7 +31,7 @@ namespace PKISharp.WACS.Host if (Environment.UserInteractive)
{
Console.WriteLine(" Press <Enter> to close");
- Console.ReadLine();
+ _ = Console.ReadLine();
} return; } |