fix: process the HEARTBEAT
event correctly
BREAKING CHANGE: Removed `get_heartbeat` method. This method was never intended to retrieve information. Use `get_heartbeats` or `get_important_heartbeats` instead.
This commit is contained in:
parent
24b6d367de
commit
762dd4a657
1 changed files with 7 additions and 37 deletions
|
@ -431,7 +431,6 @@ class UptimeKumaApi(object):
|
||||||
Event.IMPORTANT_HEARTBEAT_LIST: None,
|
Event.IMPORTANT_HEARTBEAT_LIST: None,
|
||||||
Event.AVG_PING: None,
|
Event.AVG_PING: None,
|
||||||
Event.UPTIME: None,
|
Event.UPTIME: None,
|
||||||
Event.HEARTBEAT: None,
|
|
||||||
Event.INFO: None,
|
Event.INFO: None,
|
||||||
Event.CERT_INFO: None,
|
Event.CERT_INFO: None,
|
||||||
Event.DOCKER_HOST_LIST: None,
|
Event.DOCKER_HOST_LIST: None,
|
||||||
|
@ -560,14 +559,14 @@ class UptimeKumaApi(object):
|
||||||
self._event_data[Event.UPTIME][monitor_id][type_] = data
|
self._event_data[Event.UPTIME][monitor_id][type_] = data
|
||||||
|
|
||||||
def _event_heartbeat(self, data) -> None:
|
def _event_heartbeat(self, data) -> None:
|
||||||
if self._event_data[Event.HEARTBEAT] is None:
|
if self._event_data[Event.HEARTBEAT_LIST] is None:
|
||||||
self._event_data[Event.HEARTBEAT] = {}
|
self._event_data[Event.HEARTBEAT_LIST] = {}
|
||||||
monitor_id = data["monitorID"]
|
monitor_id = data["monitorID"]
|
||||||
if monitor_id not in self._event_data[Event.HEARTBEAT]:
|
if monitor_id not in self._event_data[Event.HEARTBEAT_LIST]:
|
||||||
self._event_data[Event.HEARTBEAT][monitor_id] = []
|
self._event_data[Event.HEARTBEAT_LIST][monitor_id] = []
|
||||||
self._event_data[Event.HEARTBEAT][monitor_id].append(data)
|
self._event_data[Event.HEARTBEAT_LIST][monitor_id].append(data)
|
||||||
if len(self._event_data[Event.HEARTBEAT][monitor_id]) >= 150:
|
if len(self._event_data[Event.HEARTBEAT_LIST][monitor_id]) >= 150:
|
||||||
self._event_data[Event.HEARTBEAT][monitor_id].pop(0)
|
self._event_data[Event.HEARTBEAT_LIST][monitor_id].pop(0)
|
||||||
|
|
||||||
# add heartbeat to important heartbeat list
|
# add heartbeat to important heartbeat list
|
||||||
if data["important"]:
|
if data["important"]:
|
||||||
|
@ -2024,35 +2023,6 @@ class UptimeKumaApi(object):
|
||||||
parse_monitor_status(r[i])
|
parse_monitor_status(r[i])
|
||||||
return r
|
return r
|
||||||
|
|
||||||
def get_heartbeat(self) -> dict:
|
|
||||||
"""
|
|
||||||
Get the next heartbeat.
|
|
||||||
|
|
||||||
:return: The next heartbeat.
|
|
||||||
:rtype: dict
|
|
||||||
|
|
||||||
Example::
|
|
||||||
|
|
||||||
>>> api.get_heartbeat()
|
|
||||||
{
|
|
||||||
1: [
|
|
||||||
{
|
|
||||||
'duration': 60,
|
|
||||||
'important': False,
|
|
||||||
'monitorID': 1,
|
|
||||||
'msg': '',
|
|
||||||
'ping': 10.6,
|
|
||||||
'status': 1,
|
|
||||||
'time': '2023-05-01 17:28:20.557'
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
r = self._get_event_data(Event.HEARTBEAT)
|
|
||||||
int_to_bool(r, ["important"])
|
|
||||||
parse_monitor_status(r)
|
|
||||||
return r
|
|
||||||
|
|
||||||
# avg ping
|
# avg ping
|
||||||
|
|
||||||
def avg_ping(self) -> dict:
|
def avg_ping(self) -> dict:
|
||||||
|
|
Loading…
Reference in a new issue