witine/lookingglass
1
0
Fork 0
forked from mirrors/thatmattlove-hyperglass
Code Issues Pull requests Releases Activity

improve log messages

Browse source
This commit is contained in:
thatmattlove 2021-12-17 20:37:03 -07:00
parent a19f0aa7d9
commit 0cd44e7fdf
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
hyperglass/api/routes.py
View file

@ -61,20 +61,20 @@ async def query(
# Initialize cache # Initialize cache
cache = state.redis cache = state.redis
log.debug("Initialized cache {}", repr(cache))
# Use hashed query_data string as key for for k/v cache store so # Use hashed query_data string as key for for k/v cache store so
# each command output value is unique. # each command output value is unique.
cache_key = f"hyperglass.query.{query_data.digest()}" cache_key = f"hyperglass.query.{query_data.digest()}"
log.info("Starting query execution for {!r}", query) log.info("{!r} starting query execution", query_data)
cache_response = cache.get_map(cache_key, "output") cache_response = cache.get_map(cache_key, "output")
json_output = False json_output = False
cached = False cached = False
runtime = 65535 runtime = 65535
if cache_response: if cache_response:
log.debug("Query {!r} exists in cache", query_data) log.debug("{!r} cache hit (cache key {!r})", query_data, cache_key)
# If a cached response exists, reset the expiration time. # If a cached response exists, reset the expiration time.
cache.expire(cache_key, expire_in=state.params.cache.timeout) cache.expire(cache_key, expire_in=state.params.cache.timeout)
@ -84,7 +84,7 @@ async def query(
timestamp = cache.get_map(cache_key, "timestamp") timestamp = cache.get_map(cache_key, "timestamp")
elif not cache_response: elif not cache_response:
log.debug("Created new cache entry {} entry for query {!r}", cache_key, query_data) log.debug("{!r} cache miss (cache key {!r})", query_data, cache_key)
timestamp = query_data.timestamp timestamp = query_data.timestamp
@ -99,7 +99,7 @@ async def query(
endtime = time.time() endtime = time.time()
elapsedtime = round(endtime - starttime, 4) elapsedtime = round(endtime - starttime, 4)
log.debug("{!r} took {} seconds to run", query_data, elapsedtime) log.debug("{!r} runtime: {!s} seconds", query_data, elapsedtime)
if output is None: if output is None:
raise HyperglassError(message=state.params.messages.general, alert="danger") raise HyperglassError(message=state.params.messages.general, alert="danger")
@ -115,7 +115,7 @@ async def query(
cache.set_map_item(cache_key, "timestamp", timestamp) cache.set_map_item(cache_key, "timestamp", timestamp)
cache.expire(cache_key, expire_in=state.params.cache.timeout) cache.expire(cache_key, expire_in=state.params.cache.timeout)
log.debug("Added cache entry for query {!r}", query_data) log.debug("{!r} cached for {!s} seconds", query_data, state.params.cache.timeout)
runtime = int(round(elapsedtime, 0)) runtime = int(round(elapsedtime, 0))
@ -128,7 +128,7 @@ async def query(
if json_output: if json_output:
response_format = "application/json" response_format = "application/json"
log.success("Completed query execution for query {!r}", query_data) log.success("{!r} execution completed", query_data)
return { return {
"output": cache_response, "output": cache_response,