From 6d2773e3f08b4792d63145bbbc4b7d0d237edd96 Mon Sep 17 00:00:00 2001 From: Alvaro Lopez Garcia Date: Fri, 27 Sep 2024 16:18:11 +0200 Subject: [PATCH] style: fix errors --- caso/messenger/logstash.py | 27 ++++++++++----------------- caso/record.py | 5 ++--- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/caso/messenger/logstash.py b/caso/messenger/logstash.py index 4ff1cf9..fc6a217 100644 --- a/caso/messenger/logstash.py +++ b/caso/messenger/logstash.py @@ -16,18 +16,16 @@ """Module containing a Logstask cASO messenger.""" +import json +import datetime import socket from oslo_config import cfg from oslo_log import log -import six from caso import exception import caso.messenger -#add json lib -import json -#add datetime lib -import datetime + opts = [ cfg.StrOpt("host", default="localhost", help="Logstash host to send records to."), @@ -55,26 +53,21 @@ def push(self, records): # NOTE(acostantini): code for the serialization and push of the # records in logstash. JSON format to be used and encoding UTF-8 - """Serialization of records to be sent to logstash""" if not records: return - #Actual timestamp to be added on each record - cdt = datetime.datetime.now() + # Actual timestamp to be added on each record ct = int(datetime.datetime.now().timestamp()) - #Open the connection with LS + # Open the connection with LS self.sock.connect((self.host, self.port)) - """Push records to logstash using tcp.""" try: - for record in records: - #serialization of record - rec=record.serialization_message() - #cASO timestamp added to each record - rec['caso-timestamp']=ct - #Send the record to LS - self.sock.send((json.dumps(rec)+'\n').encode('utf-8')) + for record in records: + # serialization of record + rec = record.serialization_message() + rec["caso-timestamp"] = ct + self.sock.send((json.dumps(rec) + "\n").encode("utf-8")) except socket.error as e: raise exception.LogstashConnectionError( host=self.host, port=self.port, exception=e diff --git a/caso/record.py b/caso/record.py index de62789..855e637 100644 --- a/caso/record.py +++ b/caso/record.py @@ -48,15 +48,14 @@ def ssm_message(self): """Render record as the expected SSM message.""" raise NotImplementedError("Method not implemented") - def serialization_message(self): """Render record as the expected logstash message.""" opts = { "by_alias": True, "exclude_none": True, } - # NOTE(acostatnini): part related to the definition of the logstash message to be - # serialized before to send data + # NOTE(acostatnini): part related to the definition of the logstash message to + # be serialized before to send data # NOTE(aloga): do not iter over the dictionary returned by record.dict() as this # is just a dictionary representation of the object, where no serialization is # done. In order to get objects correctly serialized we need to convert to JSON,