mirror of
https://github.com/EDCD/EDDN.git
synced 2025-06-08 19:32:25 +03:00
Bouncer: Support --loglevel <level>
CL arg
This also aligns the general logger setup with the other scripts
This commit is contained in:
parent
6986af7ca0
commit
8f7910a5d9
@ -26,6 +26,7 @@ Architecture:
|
|||||||
4. `push_message()` then sends the message to the configured live/real
|
4. `push_message()` then sends the message to the configured live/real
|
||||||
Gateway.
|
Gateway.
|
||||||
"""
|
"""
|
||||||
|
import argparse
|
||||||
import gevent
|
import gevent
|
||||||
import hashlib
|
import hashlib
|
||||||
import logging
|
import logging
|
||||||
@ -47,8 +48,15 @@ from bottle import Bottle, run, request, response, get, post
|
|||||||
app = Bottle()
|
app = Bottle()
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
logger.setLevel(logging.DEBUG)
|
logger.setLevel(logging.INFO)
|
||||||
logger.addHandler(logging.StreamHandler())
|
__logger_channel = logging.StreamHandler()
|
||||||
|
__logger_formatter = logging.Formatter(
|
||||||
|
'%(asctime)s - %(levelname)s - %(module)s:%(lineno)d: %(message)s'
|
||||||
|
)
|
||||||
|
__logger_formatter.default_time_format = '%Y-%m-%d %H:%M:%S'
|
||||||
|
__logger_formatter.default_msec_format = '%s.%03d'
|
||||||
|
__logger_channel.setFormatter(__logger_formatter)
|
||||||
|
logger.addHandler(__logger_channel)
|
||||||
logger.info('Made logger')
|
logger.info('Made logger')
|
||||||
|
|
||||||
|
|
||||||
@ -57,6 +65,27 @@ from eddn.core.StatsCollector import StatsCollector
|
|||||||
statsCollector = StatsCollector()
|
statsCollector = StatsCollector()
|
||||||
statsCollector.start()
|
statsCollector.start()
|
||||||
|
|
||||||
|
|
||||||
|
def parse_cl_args():
|
||||||
|
parser = argparse.ArgumentParser(
|
||||||
|
prog='Gateway',
|
||||||
|
description='EDDN Gateway server',
|
||||||
|
)
|
||||||
|
|
||||||
|
parser.add_argument(
|
||||||
|
'--loglevel',
|
||||||
|
help='Logging level to output at',
|
||||||
|
)
|
||||||
|
|
||||||
|
parser.add_argument(
|
||||||
|
'-c', '--config',
|
||||||
|
metavar='config filename',
|
||||||
|
nargs='?',
|
||||||
|
default=None,
|
||||||
|
)
|
||||||
|
|
||||||
|
return parser.parse_args()
|
||||||
|
|
||||||
def push_message(message_body):
|
def push_message(message_body):
|
||||||
"""
|
"""
|
||||||
Spawned as a greenlet to push messages (strings) through ZeroMQ.
|
Spawned as a greenlet to push messages (strings) through ZeroMQ.
|
||||||
@ -243,8 +272,12 @@ class CustomLogging(object):
|
|||||||
return _log_to_logger
|
return _log_to_logger
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
cl_args = parse_cl_args()
|
||||||
|
if cl_args.loglevel:
|
||||||
|
logger.setLevel(cl_args.loglevel)
|
||||||
|
|
||||||
logger.info('Loading config...')
|
logger.info('Loading config...')
|
||||||
loadConfig()
|
loadConfig(cl_args)
|
||||||
|
|
||||||
logger.info('Installing EnableCors ...')
|
logger.info('Installing EnableCors ...')
|
||||||
app.install(EnableCors())
|
app.install(EnableCors())
|
||||||
|
Loading…
x
Reference in New Issue
Block a user