Skip to content

Bug fix and feature enhancement #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fmnisme merged 3 commits into from
Jun 4, 2020
Merged

Bug fix and feature enhancement #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4904833
data received in event streaming mode needs to be decoded
scientress Mar 24, 2019
d871a17
add upstream error data if available to Icinga2ApiExceptions
scientress Mar 24, 2019
a8de62b
explicitly decode byte returned by iter_content
scientress Mar 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion icinga2api/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,18 @@ def _request(self, method, url_path, payload=None, stream=False):
# pprint(response)

if not 200 <= response.status_code <= 299:
try:
upstream_error=response.json()
except ValueError:
upstream_error=None
raise Icinga2ApiException(
'Request "{}" failed with status {}: {}'.format(
response.url,
response.status_code,
response.text,
))
),
upstream_error=upstream_error,
)

if stream:
return response
Expand All @@ -153,6 +159,7 @@ def _get_message_from_stream(stream):
# TODO: test iter_lines()
message = ''
for char in stream.iter_content():
char = char.decode()
if char == '\n':
yield message
message = ''
Expand Down
3 changes: 2 additions & 1 deletion icinga2api/exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ class Icinga2ApiException(Exception):
Icinga 2 API exception class
'''

def __init__(self, error):
def __init__(self, error, upstream_error=None):
super(Icinga2ApiException, self).__init__(error)
self.error = error
self.upstream_error = upstream_error

def __str__(self):
return str(self.error)
Expand Down