darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 01:41:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

get rid of duplicated code

Browse Source
This commit is contained in:
Kenneth Kehl
2024-12-16 08:29:34 -08:00
parent 85e100febe
commit 2707f757c8
1 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/clients/cloudwatch/aws_cloudwatch.py
View File

@@ -121,6 +121,11 @@ class AwsCloudwatchClient(Client):
| sort @timestamp asc | sort @timestamp asc
""" """
delivered = self.run_log_insights_query(log_group_name, start, end, query)
failed = self.run_log_insights_query(log_group_name_failed, start, end, query)
return delivered + failed
def run_log_insights_query(self, log_group_name, start, end, query):
response = self._client.start_query( response = self._client.start_query(
logGroupName=log_group_name, logGroupName=log_group_name,
startTime=int(start.timestamp()), startTime=int(start.timestamp()),
@@ -129,7 +134,7 @@ class AwsCloudwatchClient(Client):
) )
query_id = response["queryId"] query_id = response["queryId"]
while True: while True:
result = client._client.get_query_results(queryId=query_id) result = self._client.get_query_results(queryId=query_id)
if result["status"] == "Complete": if result["status"] == "Complete":
break break
sleep(1) sleep(1)
@@ -138,28 +143,4 @@ class AwsCloudwatchClient(Client):
for log in result["results"]: for log in result["results"]:
receipt = {field["field"]: field["value"] for field in log} receipt = {field["field"]: field["value"] for field in log}
delivery_receipts.append(receipt) delivery_receipts.append(receipt)
print(receipt) return delivery_receipts
delivered = delivery_receipts
response = client._client.start_query(
logGroupName=log_group_name_failed,
startTime=int(start.timestamp()),
endTime=int(end.timestamp()),
queryString=query,
)
query_id = response["queryId"]
while True:
result = client._client.get_query_results(queryId=query_id)
if result["status"] == "Complete":
break
sleep(1)
delivery_receipts = []
for log in result["results"]:
receipt = {field["field"]: field["value"] for field in log}
delivery_receipts.append(receipt)
print(receipt)
failed = delivery_receipts
return delivered + failed