Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mandatory fields for logs and position #12

Merged
merged 2 commits into from
Dec 11, 2020
Merged

Mandatory fields for logs and position #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b387e1
Mandatory fields for logs and position
dignajar Dec 11, 2020
293f8c1
Improve variable names
dignajar Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions files/logs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datetime import datetime, timedelta
from datetime import datetime
from flask import request
from os import environ
import json
Expand All @@ -15,31 +15,37 @@ def __init__(self, objectName):

self.objectName = objectName

def __print__(self, fields):
fields['level'] = self.level
fields['objectName'] = self.objectName
fields['date'] = datetime.now().strftime("%Y-%m-%d %H:%M:%S")

def __print__(self, extraFields):
fields = {
'date': datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
'level': self.level,
'objectName': self.objectName,
'ip': '',
'referrer': ''
}
# Try to get IP and referrer from user
try:
fields['ip'] = request.environ.get('HTTP_X_REAL_IP', request.remote_addr)
fields['referrer'] = request.headers.get("Referer")
except Exception as e:
pass

# Include extra fields custom by the user
fields.update(extraFields)

if self.format == 'JSON':
print(json.dumps(fields))
else:
print(" - ".join(fields.values()))
print(' - '.join(map(str, fields.values())))

def error(self, fields):
def error(self, extraFields):
if self.level in ['INFO', 'WARNING', 'ERROR']:
self.__print__(fields)
self.__print__(extraFields)

def warning(self, fields):
def warning(self, extraFields):
if self.level in ['INFO', 'WARNING']:
self.__print__(fields)
self.__print__(extraFields)

def info(self, fields):
def info(self, extraFields):
if self.level in ['INFO']:
self.__print__(fields)
self.__print__(extraFields)