Commit b7100912 authored by Ibrahim Ahmed's avatar Ibrahim Ahmed
Browse files

monitor: Bugfix for remote logging for incomplete messages

parent aaea0517

src/monitor.py

+4 −3
Changes for src/monitor.py: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ messages sent via HTTP/POST requests. 
"""



from argparse import ArgumentParser, Namespace

import logging



from flask import request

from dash import Dash
@@ -31,8 +32,8 @@ dapp.layout = html.Div([ 
def log():

    logger = get_logger('monitor')

    rdict = request.form

    ip = request.environ.ge('HTTP_X_REAL_IP', request.remote_addr)

    logger.log(int(rdict['levelno']), 'From: %s. %s' % (ip, rdict['message']))

    ip = request.environ.get('HTTP_X_REAL_IP', request.remote_addr)

    logger.log(int(rdict.get('levelno', logging.ERROR)), 'From: %s. %s' % (ip, rdict.get('message', 'NO_MESSAGE')))

    return 'OK'
@@ -67,5 +68,5 @@ if __name__ == '__main__': 
    settings = get_settings(args, section='MONITOR')

    logger = get_logger('monitor')

    logger = make_logger(enable=('stream', 'file', 'email'), logger=logger, **settings)

    logger.info('Started monitoring...')

    logger.info('Started monitoring on %s:%s ...' % (settings['host'], settings['port']))

    dapp.run_server(host=settings['host'], port=settings['port'], debug=True)

src/utils/logging.py

+1 −0
Changes for src/utils/logging.py: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ def make_logger(enable='all', logger=None, formatter=None, **settings) -> loggin 
        remote_log = settings.get('logs_server')

        remote_verbosity = settings.get('logs_server_verbosity')

        if remote_log not in ('', None) and remote_verbosity not in ('', None):

            logger.info('Remote logging to %s' % remote_log)

            parsed = urlparse(remote_log)

            handler_remote = RemoteHandler(host=parsed.netloc, url=parsed.path, method='POST')

            handler_remote.setLevel(remote_verbosity)