[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [nyx/master] Logging in all caching scenarios
commit b9e053241ea5370017f62ea4cb57d70301fc93ca
Author: Damian Johnson <atagar@xxxxxxxxxxxxxx>
Date: Thu Aug 31 11:45:03 2017 -0700
Logging in all caching scenarios
Providing a log message in all caching scenarios when we load the cache, rather
than only when the schema is out of date.
---
nyx/cache.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/nyx/cache.py b/nyx/cache.py
index b989f20..8892be3 100644
--- a/nyx/cache.py
+++ b/nyx/cache.py
@@ -54,10 +54,15 @@ class Cache(object):
self._conn = sqlite3.connect(cache_path)
schema = self._conn.execute('SELECT version FROM schema').fetchone()[0]
except:
- schema = 'no schema'
+ schema = None
- if schema != SCHEMA_VERSION:
- stem.util.log.info('Cache schema of %s is out of date (has %s but current version is %s). Clearing the cache.' % (cache_path, schema, SCHEMA_VERSION))
+ if schema == SCHEMA_VERSION:
+ stem.util.log.info('Cache loaded from %s' % cache_path)
+ else:
+ if schema is None:
+ stem.util.log.info('Cache at %s is missing a schema, clearing it.' % cache_path)
+ else:
+ stem.util.log.info('Cache at %s has schema version %s but the current version is %s, clearing it.' % (cache_path, schema, SCHEMA_VERSION))
self._conn.close()
os.remove(cache_path)
@@ -66,6 +71,7 @@ class Cache(object):
for cmd in SCHEMA:
self._conn.execute(cmd)
else:
+ stem.util.log.info('Unable to cache to disk. Using an in-memory cache instead.')
self._conn = sqlite3.connect(':memory:')
for cmd in SCHEMA:
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits