From 92b612f62fe1e914340156d5d5b5c0b71089c3f5 Mon Sep 17 00:00:00 2001 From: nir0s Date: Sat, 17 Feb 2018 20:42:05 +0200 Subject: [PATCH] Use single quotes instead of double quotes all around --- logzio/handler.py | 25 +++++++++++------------ logzio/sender.py | 51 +++++++++++++++++++++++------------------------ 2 files changed, 37 insertions(+), 39 deletions(-) diff --git a/logzio/handler.py b/logzio/handler.py index 9c223a5..aa48c3d 100644 --- a/logzio/handler.py +++ b/logzio/handler.py @@ -19,7 +19,7 @@ class LogzioHandler(logging.Handler): debug=False): if not token: - raise LogzioException("Logz.io Token must be provided") + raise LogzioException('Logz.io Token must be provided') self.logzio_type = logzio_type @@ -70,30 +70,29 @@ class LogzioHandler(logging.Handler): def format_message(self, message): now = datetime.datetime.utcnow() - timestamp = now.strftime("%Y-%m-%dT%H:%M:%S") + \ - ".%03d" % (now.microsecond / 1000) + "Z" + timestamp = now.strftime('%Y-%m-%dT%H:%M:%S') + \ + '.%03d' % (now.microsecond / 1000) + 'Z' return_json = { - "logger": message.name, - "line_number": message.lineno, - "path_name": message.pathname, - "log_level": message.levelname, - "type": self.logzio_type, - "message": message.getMessage(), - "@timestamp": timestamp + 'logger': message.name, + 'line_number': message.lineno, + 'path_name': message.pathname, + 'log_level': message.levelname, + 'type': self.logzio_type, + 'message': message.getMessage(), + '@timestamp': timestamp } if message.exc_info: - return_json["exception"] = self.format_exception(message.exc_info) + return_json['exception'] = self.format_exception(message.exc_info) else: formatted_message = self.format(message) - return_json.update(self.extra_fields(message)) if isinstance(formatted_message, dict): return_json.update(formatted_message) else: - return_json["message"] = formatted_message + return_json['message'] = formatted_message return return_json diff --git a/logzio/sender.py b/logzio/sender.py index 8c29fee..d0037db 100644 --- a/logzio/sender.py +++ b/logzio/sender.py @@ -19,33 +19,32 @@ MAX_BULK_SIZE_IN_BYTES = 1 * 1024 * 1024 # 1 MB def backup_logs(logs): - timestamp = datetime.now().strftime("%d%m%Y-%H%M%S") - print("Backing up your logs to logzio-failures-{}.txt".format(timestamp)) - with open("logzio-failures-{}.txt".format(timestamp), "a") as f: + timestamp = datetime.now().strftime('%d%m%Y-%H%M%S') + print('Backing up your logs to logzio-failures-{}.txt'.format(timestamp)) + with open('logzio-failures-{}.txt'.format(timestamp), 'a') as f: f.writelines('\n'.join(logs)) class LogzioSender: - def __init__(self, - token, url="https://listener.logz.io:8071", + token, url='https://listener.logz.io:8071', logs_drain_timeout=5, debug=False): self.token = token - self.url = "{}/?token={}".format(url, token) + self.url = '{}/?token={}'.format(url, token) self.logs_drain_timeout = logs_drain_timeout self.debug = debug # Function to see if the main thread is alive self.is_main_thread_active = lambda: any( - (i.name == "MainThread") and i.is_alive() for i in enumerate()) + (i.name == 'MainThread') and i.is_alive() for i in enumerate()) # Create a queue to hold logs self.queue = queue.Queue() self.sending_thread = Thread(target=self._drain_queue) self.sending_thread.daemon = False - self.sending_thread.name = "logzio-sending-thread" + self.sending_thread.name = 'logzio-sending-thread' self.sending_thread.start() def append(self, logs_message): @@ -67,8 +66,8 @@ class LogzioSender: # all logs if not self.is_main_thread_active(): self._debug( - "Identified quit of main thread, sending logs one " - "last time") + 'Identified quit of main thread, sending logs one ' + 'last time') last_try = True try: @@ -77,8 +76,8 @@ class LogzioSender: # TODO: Which exception? except Exception as e: self._debug( - "Unexpected exception while draining queue to Logz.io, " - "swallowing. Exception: {}".format(e)) + 'Unexpected exception while draining queue to Logz.io, ' + 'swallowing. Exception: {}'.format(e)) if not last_try: sleep(self.logs_drain_timeout) @@ -89,7 +88,7 @@ class LogzioSender: while not self.queue.empty(): logs_list = self._get_messages_up_to_max_allowed_size() self._debug( - "Starting to drain {} logs to Logz.io".format(len(logs_list))) + 'Starting to drain {} logs to Logz.io'.format(len(logs_list))) # Not configurable from the outside sleep_between_retries = 2 @@ -105,23 +104,23 @@ class LogzioSender: self.url, headers=headers, data='\n'.join(logs_list)) if response.status_code != 200: if response.status_code == 400: - print("Got 400 code from Logz.io. This means that " - "some of your logs are too big, or badly " - "formatted. response: {}".format( + print('Got 400 code from Logz.io. This means that ' + 'some of your logs are too big, or badly ' + 'formatted. response: {}'.format( response.text)) should_backup_to_disk = False break if response.status_code == 401: print( - "You are not authorized with Logz.io! Token " - "OK? dropping logs...") + 'You are not authorized with Logz.io! Token ' + 'OK? dropping logs...') should_backup_to_disk = False break else: print( - "Got {} while sending logs to Logz.io, " - "Try ({}/{}). Response: {}".format( + 'Got {} while sending logs to Logz.io, ' + 'Try ({}/{}). Response: {}'.format( response.status_code, current_try + 1, number_of_retries, @@ -129,15 +128,15 @@ class LogzioSender: should_retry = True else: self._debug( - "Successfully sent bulk of {} logs to " - "Logz.io!".format(len(logs_list))) + 'Successfully sent bulk of {} logs to ' + 'Logz.io!'.format(len(logs_list))) should_backup_to_disk = False break # TODO: Which exception? except Exception as e: - print("Got exception while sending logs to Logz.io, " - "Try ({}/{}). Message: {}".format( + print('Got exception while sending logs to Logz.io, ' + 'Try ({}/{}). Message: {}'.format( current_try + 1, number_of_retries, e)) should_retry = True @@ -147,8 +146,8 @@ class LogzioSender: if should_backup_to_disk: # Write to file - print("Could not send logs to Logz.io after {} tries, " - "backing up to local file system".format( + print('Could not send logs to Logz.io after {} tries, ' + 'backing up to local file system'.format( number_of_retries)) backup_logs(logs_list)