-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes repository error handling and JSON error handling
- Loading branch information
1 parent
9a20904
commit a2294b3
Showing
13 changed files
with
205 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| function Add-IcingaRepositoryErrorState() | ||
| { | ||
| param ( | ||
| [string]$Repository = $null | ||
| ); | ||
|
|
||
| if ([string]::IsNullOrEmpty($Repository)) { | ||
| return; | ||
| } | ||
|
|
||
| if ($Global:Icinga -eq $null) { | ||
| return; | ||
| } | ||
|
|
||
| if ($Global:Icinga.Contains('Private') -eq $FALSE) { | ||
| return; | ||
| } | ||
|
|
||
| if ($Global:Icinga.Private.Contains('RepositoryStatus') -eq $FALSE) { | ||
| return; | ||
| } | ||
|
|
||
| if ($Global:Icinga.Private.RepositoryStatus.Contains('FailedRepositories') -eq $FALSE) { | ||
| return; | ||
| } | ||
|
|
||
| if ($Global:Icinga.Private.RepositoryStatus.FailedRepositories.ContainsKey($Repository)) { | ||
| return; | ||
| } | ||
|
|
||
| $Global:Icinga.Private.RepositoryStatus.FailedRepositories.Add($Repository, $TRUE); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| function Clear-IcingaRepositoryErrorState() | ||
| { | ||
| if ($Global:Icinga -eq $null) { | ||
| return; | ||
| } | ||
|
|
||
| if ($Global:Icinga.Contains('Private') -eq $FALSE) { | ||
| return; | ||
| } | ||
|
|
||
| if ($Global:Icinga.Private.Contains('RepositoryStatus') -eq $FALSE) { | ||
| return; | ||
| } | ||
|
|
||
| $Global:Icinga.Private.RepositoryStatus.FailedRepositories = @{ }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| function Test-IcingaJSONObject() | ||
| { | ||
| param ( | ||
| [string]$InputObject = $null | ||
| ); | ||
|
|
||
| if ([string]::IsNullOrEmpty($InputObject)) { | ||
| return $FALSE; | ||
| } | ||
|
|
||
| try { | ||
| $JSONContent = ConvertFrom-Json -InputObject $InputObject -ErrorAction Stop; | ||
| return $TRUE; | ||
| } catch { | ||
| [string]$ErrMsg = $_.Exception.Message; | ||
|
|
||
| if ($ErrMsg.Contains('(') -And $ErrMsg.Contains(')')) { | ||
| try { | ||
| [int]$ErrLocation = $ErrMsg.Substring($ErrMsg.IndexOf('(') + 1, $ErrMsg.IndexOf(')') - $ErrMsg.IndexOf('(') - 1) - 1; | ||
| [string]$ExceptionMsg = $ErrMsg.Substring(0, $ErrMsg.IndexOf(')') + 1); | ||
| [string]$ErrOutput = $InputObject.Substring(0, $ErrLocation); | ||
| [array]$ErrArray = $ErrOutput.Split("`n"); | ||
| [string]$Indentation = ''; | ||
| [string]$ErrLine = ''; | ||
|
|
||
| [int]$tmp = 0; | ||
| foreach ($entry in $ErrArray) { | ||
| $tmp += 1; | ||
| } | ||
|
|
||
| foreach ($character in ([string]($ErrArray[$ErrArray.Count - 2])).ToCharArray()) { | ||
| if ([string]::IsNullOrEmpty($character) -Or $character -eq ' ') { | ||
| $Indentation += ' '; | ||
| } else { | ||
| $ErrLine += '^'; | ||
| } | ||
| } | ||
|
|
||
| $ErrOutput = [string]::Format('{0}{1}{2}{3}', $ErrOutput, (New-IcingaNewLine), $Indentation, $ErrLine); | ||
|
|
||
| Write-IcingaConsoleError 'Failed to parse JSON object. Exception: {0}{1}{2}' -Objects $ExceptionMsg, (New-IcingaNewLine), $ErrOutput; | ||
| return $FALSE; | ||
| } catch { | ||
| Write-IcingaConsoleError 'Failed to parse JSON object: {0}' -Objects $ErrMsg; | ||
| return $FALSE; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return $TRUE; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| function Test-IcingaRepositoryErrorState() | ||
| { | ||
| param ( | ||
| [string]$Repository | ||
| ); | ||
|
|
||
| if ([string]::IsNullOrEmpty($Repository)) { | ||
| return $FALSE; | ||
| } | ||
|
|
||
| if ($Global:Icinga -eq $null) { | ||
| return $FALSE; | ||
| } | ||
|
|
||
| if ($Global:Icinga.Contains('Private') -eq $FALSE) { | ||
| return $FALSE; | ||
| } | ||
|
|
||
| if ($Global:Icinga.Private.Contains('RepositoryStatus') -eq $FALSE) { | ||
| return $FALSE; | ||
| } | ||
|
|
||
| if ($Global:Icinga.Private.RepositoryStatus.Contains('FailedRepositories') -eq $FALSE) { | ||
| return $FALSE; | ||
| } | ||
|
|
||
| if ($Global:Icinga.Private.RepositoryStatus.FailedRepositories.ContainsKey($Repository) -eq $FALSE) { | ||
| return $FALSE; | ||
| } | ||
|
|
||
| return $TRUE; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters