Skip to content
Snippets Groups Projects
Commit 48c83444 authored by Nikolay Stanchev's avatar Nikolay Stanchev
Browse files

Fixed logging of information related to the CLMC service

parent b621b769
No related branches found
No related tags found
No related merge requests found
......@@ -258,7 +258,7 @@ class RoundTripTimeQuery(object):
db_client = InfluxDBClient(host=url_object.hostname, port=url_object.port, database=influx_db_name, timeout=10)
query = 'SELECT mean(*) FROM "{0}"."autogen"."e2e_delays" WHERE time >= {1} and time < {2} and sf_instance = \'{3}\''.format(
influx_db_name, start_timestamp, end_timestamp, media_service)
log.info(query)
log.info("Executing query: {0}".format(query))
result = db_client.query(query)
actual_result = next(result.get_points(), None)
......@@ -274,8 +274,14 @@ class RoundTripTimeQuery(object):
rtt = self.calculate_round_trip_time(forward_latency, reverse_latency, service_delay, request_size, response_size, bandwidth)
return {"result": rtt}
except:
raise HTTPInternalServerError("Cannot instantiate connection with database {0} on url {1}.".format(influx_db_name, influx_db_url))
except Exception as e:
msg = "Cannot instantiate connection with database {0} on url {1}.".format(influx_db_name, influx_db_url)
log.info(msg)
log.error(type(e))
log.error(e)
log.error(e.args)
raise HTTPInternalServerError(msg)
except AssertionError:
raise HTTPBadRequest('Bad request content - must be in JSON format: {"media_service": value, "start_timestamp": value, "end_timestamp": value}.')
......
......@@ -11,7 +11,8 @@ pyramid.debug_authorization = false
pyramid.debug_notfound = false
pyramid.debug_routematch = false
pyramid.default_locale_name = en
pyramid.includes = pyramid_debugtoolbar
pyramid.includes = pyramid_debugtoolbar pyramid_exclog
exclog.ignore =
## Aggregator default configuration
aggregator_report_period = 5
......@@ -36,22 +37,22 @@ listen = localhost:9080
###
[loggers]
keys = root, clmcservice
keys = root, exc_logger
[handlers]
keys = console, filelog
keys = console, filelog, exc_handler
[formatters]
keys = generic
keys = generic, exc_formatter
[logger_root]
level = INFO
handlers = console, filelog
[logger_clmcservice]
level = DEBUG
handlers =
qualname = clmcservice
[logger_exc_logger]
level = ERROR
handlers = exc_handler
qualname = exc_logger
[handler_console]
class = StreamHandler
......@@ -62,8 +63,17 @@ formatter = generic
[handler_filelog]
class = FileHandler
args = ('/var/log/clmcservice/service.log','a')
level = INFO
level = NOTSET
formatter = generic
[handler_exc_handler]
class = FileHandler
args = ('/var/log/clmcservice/service-exceptions.log', 'a')
level = ERROR
formatter = exc_formatter
[formatter_generic]
format = %(asctime)s %(levelname)-5.5s [%(name)s:%(lineno)s][%(threadName)s] %(message)s
[formatter_exc_formatter]
format = %(asctime)s %(message)s
\ No newline at end of file
......@@ -11,6 +11,8 @@ pyramid.debug_authorization = false
pyramid.debug_notfound = false
pyramid.debug_routematch = false
pyramid.default_locale_name = en
pyramid.includes = pyramid_exclog
exclog.ignore =
## Aggregator default configuration
aggregator_report_period = 5
......@@ -31,22 +33,22 @@ listen = *:9080
###
[loggers]
keys = root, clmcservice
keys = root, exc_logger
[handlers]
keys = console, filelog
keys = console, filelog, exc_handler
[formatters]
keys = generic
keys = generic, exc_formatter
[logger_root]
level = WARN
level = INFO
handlers = console, filelog
[logger_clmcservice]
level = WARN
handlers =
qualname = clmcservice
[logger_exc_logger]
level = ERROR
handlers = exc_handler
qualname = exc_logger
[handler_console]
class = StreamHandler
......@@ -57,8 +59,17 @@ formatter = generic
[handler_filelog]
class = FileHandler
args = ('/var/log/clmcservice/service.log','a')
level = INFO
level = NOTSET
formatter = generic
[handler_exc_handler]
class = FileHandler
args = ('/var/log/clmcservice/service-exceptions.log', 'a')
level = ERROR
formatter = exc_formatter
[formatter_generic]
format = %(asctime)s %(levelname)-5.5s [%(name)s:%(lineno)s][%(threadName)s] %(message)s
[formatter_exc_formatter]
format = %(asctime)s %(message)s
\ No newline at end of file
......@@ -44,6 +44,7 @@ requires = [
'plaster_pastedeploy',
'pyramid',
'pyramid_debugtoolbar',
'pyramid_exclog',
'waitress',
'influxdb',
'pytest',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment