ProVM/secretary
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cambios varios

Browse Source
This commit is contained in:
Aldarien
2020-11-12 18:56:12 -03:00
parent 9adafbae13
commit 3eae0194f7
15 changed files with 282 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
common/helper/logger.py
View File

@ -9,47 +9,37 @@ class Logger:
"""
Clase que lleva el diario de actividades de la secretaria
"""
def __init__(self, log_folder, timezone):
def __init__(self, log_folder, timezone, name):
self.folder = log_folder
self.tz = timezone
self.name = name
self.messages = []
def load_last(self):
files = [f for f in os.listdir(self.folder) if os.path.isfile(os.path.join(self.folder, f))]
today = datetime.datetime.now(tz=self.tz)
if len(files) == 0:
self.messages = []
return
last = files[-1]
self.messages = []
with open(os.path.join(self.folder, last), 'r') as f:
self.messages.append(f.readline())
def get_filename(self):
files = [f for f in os.listdir(self.folder) if os.path.isfile(os.path.join(self.folder, f)) and 'dairy' in f]
files = [f for f in os.listdir(self.folder) if os.path.isfile(os.path.join(self.folder, f)) and 'diary' in f]
today = datetime.datetime.now(tz=self.tz)
if len(files) == 0:
return os.path.join(self.folder, 'diary-{0}.log'.format(today.strftime('%Y-%m-%d')))
return os.path.join(self.folder, self.name + '-diary-{0}.log'.format(today.strftime('%Y-%m-%d')))
last = files[-1]
return os.path.join(self.folder, last)
def start_new(self):
today = datetime.datetime.now(tz=self.tz)
filename = os.path.join(self.folder, 'diary-{0}.log'.format(today.strftime('%Y-%m-%d')))
filename = os.path.join(self.folder, self.name + '-diary-{0}.log'.format(today.strftime('%Y-%m-%d')))
with open(filename, 'w') as f:
pass
def start_log(self):
today = datetime.datetime.now(tz=self.tz)
locale.setlocale(locale.LC_TIME, 'es_ES')
msg = 'Inicio un nuevo dia siendo las {0} del {1}'.format(today.strftime('%H:%M:%S'),
msg = 'Inicio una nueva jornada siendo las {0} del {1}'.format(today.strftime('%H:%M:%S'),
today.strftime('%d de %B de %Y'))
self.log(msg)
def stop_log(self):
now = datetime.datetime.now(tz=self.tz)
locale.setlocale(locale.LC_TIME, 'es_ES')
msg = 'Siendo las {0}, termino mis registros por hoy'.format(now.strftime('%H:%M:%S'))
msg = 'Siendo las {0}, termino mis registros por esta jornada'.format(now.strftime('%H:%M:%S'))
self.log(msg)
msg = '--------'
self.log(msg)
@ -84,13 +74,13 @@ class Worker(Thread):
self.event = params['events']['stop']
self.queue = params['queues']['log']
self.wait = configs.get('supervisor.wait')
self.logger = Logger(params['folders']['log'], configs.get('timezone'))
self.logger = Logger(params['folders']['log'], configs.get('timezone'), params['logger']['name'])
self.logging = params['logging']
self.queue.put({'is_start': True})
def run(self):
self.logging.log('Starting', caller=type(self))
while not self.event.is_set():
self.logging.log('Looping status {0}'.format(not self.event.is_set()), caller=type(self))
try:
message = self.queue.get(timeout=self.wait)
self.logging.log('Logger received message', caller=type(self))

5
common/helper/logging.py
View File

@ -6,9 +6,10 @@ class Logging:
"""
Clase que registra los eventos del flujo del programa en archivos
"""
def __init__(self, timezone, folder=None):
def __init__(self, timezone, folder=None, name=''):
self.tz = timezone
self.folder = folder
self.name = name
self.filename = self.get_filename()
self.log('------')
@ -19,7 +20,7 @@ class Logging:
if os.path.getsize(os.path.join(self.folder, filename)) < 1024 * 1024:
return filename
today = datetime.datetime.now(tz=self.tz)
filename = 'logging-{0}.log'.format(today.strftime('%Y-%m-%d'))
filename = '-'.join([self.name, 'logging-{0}.log'.format(today.strftime('%Y-%m-%d'))]).strip('-')
base_name = filename
n = 1
while os.path.isfile(os.path.join(self.folder, filename)):