spla/Mastodonplus.py
1
0
Fork 0
Codi Incidències Sol·licituds Pull Paquets Projectes Llançaments Wiki Activitat

add timeouts to streams (GH-127)

Explorar la Font
This commit is contained in:
codl 2018-04-08 23:06:09 +02:00
pare d98a3546a3
commit 06a7a875fe
No se encontró ninguna clave conocida en la base de datos para esta firma
ID de clave GPG: 6CD7C8891ED1233A
S'han modificat 1 arxius amb 12 adicions i 10 eliminacions
Mostrar estadístiques Descarregar el fitxer de pedaç Descarregar el fitxer de diferències Expand all files Collapse all files

22
mastodon/Mastodon.py
Veure arxiu

@ -89,6 +89,7 @@ class Mastodon:
""" """
__DEFAULT_BASE_URL = 'https://mastodon.social' __DEFAULT_BASE_URL = 'https://mastodon.social'
__DEFAULT_TIMEOUT = 300 __DEFAULT_TIMEOUT = 300
__DEFAULT_STREAM_TIMEOUT = 300
__SUPPORTED_MASTODON_VERSION = "2.2.0" __SUPPORTED_MASTODON_VERSION = "2.2.0"
### ###
@ -1395,37 +1396,37 @@ class Mastodon:
return self.__stream('/api/v1/streaming/user', listener, async=async) return self.__stream('/api/v1/streaming/user', listener, async=async)
@api_version("1.1.0", "1.4.2") @api_version("1.1.0", "1.4.2")
def stream_public(self, listener, async=False): def stream_public(self, listener, async=False, timeout=__DEFAULT_STREAM_TIMEOUT):
""" """
Streams public events. Streams public events.
""" """
return self.__stream('/api/v1/streaming/public', listener, async=async) return self.__stream('/api/v1/streaming/public', listener, async=async, timeout=timeout)
@api_version("1.1.0", "1.4.2") @api_version("1.1.0", "1.4.2")
def stream_local(self, listener, async=False): def stream_local(self, listener, async=False, timeout=__DEFAULT_STREAM_TIMEOUT):
""" """
Streams local public events. Streams local public events.
""" """
return self.__stream('/api/v1/streaming/public/local', listener, async=async) return self.__stream('/api/v1/streaming/public/local', listener, async=async, timeout=timeout)
@api_version("1.1.0", "1.4.2") @api_version("1.1.0", "1.4.2")
def stream_hashtag(self, tag, listener, async=False): def stream_hashtag(self, tag, listener, async=False, timeout=__DEFAULT_STREAM_TIMEOUT):
""" """
Stream for all public statuses for the hashtag 'tag' seen by the connected Stream for all public statuses for the hashtag 'tag' seen by the connected
instance. instance.
""" """
if tag.startswith("#"): if tag.startswith("#"):
raise MastodonIllegalArgumentError("Tag parameter should omit leading #") raise MastodonIllegalArgumentError("Tag parameter should omit leading #")
return self.__stream("/api/v1/streaming/hashtag?tag={}".format(tag), listener, async=async) return self.__stream("/api/v1/streaming/hashtag?tag={}".format(tag), listener, async=async, timeout=timeout)
@api_version("2.1.0", "2.1.0") @api_version("2.1.0", "2.1.0")
def stream_list(self, id, listener, async=False): def stream_list(self, id, listener, async=False, timeout=__DEFAULT_STREAM_TIMEOUT):
""" """
Stream events for the current user, restricted to accounts on the given Stream events for the current user, restricted to accounts on the given
list. list.
""" """
id = self.__unpack_id(id) id = self.__unpack_id(id)
return self.__stream("/api/v1/streaming/list?list={}".format(id), listener, async=async) return self.__stream("/api/v1/streaming/list?list={}".format(id), listener, async=async, timeout=timeout)
### ###
# Internal helpers, dragons probably # Internal helpers, dragons probably
@ -1667,7 +1668,7 @@ class Mastodon:
return response return response
def __stream(self, endpoint, listener, params={}, async=False): def __stream(self, endpoint, listener, params={}, async=False, timeout=__DEFAULT_STREAM_TIMEOUT):
""" """
Internal streaming API helper. Internal streaming API helper.
@ -1697,7 +1698,8 @@ class Mastodon:
url = url[:-1] url = url[:-1]
headers = {"Authorization": "Bearer " + self.access_token} headers = {"Authorization": "Bearer " + self.access_token}
connection = requests.get(url + endpoint, headers = headers, data = params, stream = True) connection = requests.get(url + endpoint, headers = headers, data = params, stream = True,
timeout=(self.request_timeout, timeout))
if connection.status_code != 200: if connection.status_code != 200:
raise MastodonNetworkError("Could not connect to streaming server: %s" % connection.reason) raise MastodonNetworkError("Could not connect to streaming server: %s" % connection.reason)