From 72aa96ba4937aae8675e07948c9c3a74d0a3f3a7 Mon Sep 17 00:00:00 2001 From: mrnapsterca Date: Wed, 19 Aug 2015 15:51:55 +0500 Subject: [PATCH 1/3] throw instead of exit --- src/wdp.backup/wdp.backup.psm1 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/wdp.backup/wdp.backup.psm1 b/src/wdp.backup/wdp.backup.psm1 index de5ef32..f28d85b 100644 --- a/src/wdp.backup/wdp.backup.psm1 +++ b/src/wdp.backup/wdp.backup.psm1 @@ -21,8 +21,7 @@ Log $cfg.Messages.End } catch { - Write-Error $_.Exception - exit 1 + throw $_.Exception } } From 4d1269fd0008f4dd929d59dc7ae6111109ef3e3b Mon Sep 17 00:00:00 2001 From: mrnapsterca Date: Wed, 19 Aug 2015 18:14:29 +0500 Subject: [PATCH 2/3] =?UTF-8?q?=D0=BF=D1=80=D0=B5=D0=B4=D1=8B=D0=B4=D1=83?= =?UTF-8?q?=D1=89=D0=B8=D0=B9=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=B4=D0=B5=D0=BF=D0=BB=D0=BE=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/wdp.backup/wdp.backup.psm1 | 2 +- src/wdp.deploy/wdp.deploy.psm1 | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/wdp.backup/wdp.backup.psm1 b/src/wdp.backup/wdp.backup.psm1 index f28d85b..f0f93da 100644 --- a/src/wdp.backup/wdp.backup.psm1 +++ b/src/wdp.backup/wdp.backup.psm1 @@ -19,7 +19,7 @@ } Log $cfg.Messages.End - + } catch { throw $_.Exception } diff --git a/src/wdp.deploy/wdp.deploy.psm1 b/src/wdp.deploy/wdp.deploy.psm1 index 9511eb0..4168b99 100644 --- a/src/wdp.deploy/wdp.deploy.psm1 +++ b/src/wdp.deploy/wdp.deploy.psm1 @@ -24,8 +24,7 @@ Log $cfg.Messages.End } catch { - Write-Error $_.Exception - exit 1 + throw $_.Exception } } From fb6bf9cdfa90c5de8c61ae44302aacded0fe9f2a Mon Sep 17 00:00:00 2001 From: mrnapsterca Date: Thu, 20 Aug 2015 18:35:35 +0500 Subject: [PATCH 3/3] throw logic --- src/wdp.backup/wdp.backup.psm1 | 10 ++++++++-- src/wdp.deploy/wdp.deploy.psm1 | 8 +++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/wdp.backup/wdp.backup.psm1 b/src/wdp.backup/wdp.backup.psm1 index f0f93da..1371238 100644 --- a/src/wdp.backup/wdp.backup.psm1 +++ b/src/wdp.backup/wdp.backup.psm1 @@ -21,7 +21,12 @@ Log $cfg.Messages.End } catch { - throw $_.Exception + if($cfg.UseThrowLogic) { + throw $_.Exception + } else { + Write-Error $_.Exception + exit 1 + } } } @@ -134,7 +139,7 @@ function BuildParameters { if($cfg.ProviderSettings) { $parameters.SourceSettings = $cfg.ProviderSettings } - + if($cfg.SkipFolderList) { $parameters.SkipFolderList = @($cfg.SkipFolderList) } @@ -157,6 +162,7 @@ $cfg = @{ PublishArtifacts = $false ProviderSettings = $null SkipFolderList = $null + UseThrowLogic = $false SkipFileList = $null Verbose = $true Messages = @{ diff --git a/src/wdp.deploy/wdp.deploy.psm1 b/src/wdp.deploy/wdp.deploy.psm1 index 4168b99..3540cf4 100644 --- a/src/wdp.deploy/wdp.deploy.psm1 +++ b/src/wdp.deploy/wdp.deploy.psm1 @@ -24,7 +24,12 @@ Log $cfg.Messages.End } catch { - throw $_.Exception + if($cfg.UseThrowLogic -eq "True") { + throw $_.Exception + } else { + Write-Error $_.Exception + exit 1 + } } } @@ -164,6 +169,7 @@ $cfg = @{ ParametersFile = $null UseSync = $true Verbose = $true + UseThrowLogic = $false Messages = @{ Begin = "deployment started..." End = "deployment finished successfully"