Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-13 06:20:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'discourse' into 'master'

Browse Source 
API Headers for Discourse

See merge request allianceauth/allianceauth!1197
This commit is contained in:
Ariel Rin 2020-05-12 00:00:43 +00:00
commit f1d5cc8903
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
allianceauth/services/modules/discourse/manager.py
View File

@ -168,7 +168,7 @@ class DiscourseManager:
for arg in kwargs: for arg in kwargs:
if arg not in endpoint['args']['required'] and arg not in endpoint['args']['optional'] and not silent: if arg not in endpoint['args']['required'] and arg not in endpoint['args']['optional'] and not silent:
logger.warn("Received unrecognized kwarg %s for endpoint %s" % (arg, endpoint)) logger.warn("Received unrecognized kwarg %s for endpoint %s" % (arg, endpoint))
r = getattr(requests, endpoint['method'])(settings.DISCOURSE_URL + endpoint['parsed_url'], params=params, r = getattr(requests, endpoint['method'])(settings.DISCOURSE_URL + endpoint['parsed_url'], headers=params,
json=data) json=data)
try: try:
if 'errors' in r.json() and not silent: if 'errors' in r.json() and not silent:
@ -185,6 +185,7 @@ class DiscourseManager:
r.raise_for_status() r.raise_for_status()
except requests.exceptions.HTTPError as e: except requests.exceptions.HTTPError as e:
raise DiscourseError(endpoint, e.response.status_code) raise DiscourseError(endpoint, e.response.status_code)
logger.debug("Discourse API output:\n{}".format(out)) # this is spamy as hell remove before release
return out return out
@staticmethod @staticmethod