hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-07 10:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix log levels

Browse Source
This commit is contained in:
Sarah Hoffmann
2020-01-20 23:34:56 +01:00
parent 4144364a15
commit a338ebfce0
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nominatim/nominatim.py
View File

@@ -146,7 +146,7 @@ class DBConnection(object):
return True return True
except psycopg2.extensions.TransactionRollbackError as e: except psycopg2.extensions.TransactionRollbackError as e:
if e.pgcode == '40P01': if e.pgcode == '40P01':
log.info("Deadlock detected, retry.") log.debug("Deadlock detected, retry.")
self.cursor.execute(self.current_query, self.current_params) self.cursor.execute(self.current_query, self.current_params)
else: else:
raise raise
@@ -167,7 +167,7 @@ class Indexer(object):
def run(self): def run(self):
""" Run indexing over the entire database. """ Run indexing over the entire database.
""" """
log.info("Starting indexing rank ({} to {}) using {} threads".format( log.warning("Starting indexing rank ({} to {}) using {} threads".format(
self.minrank, self.maxrank, len(self.threads))) self.minrank, self.maxrank, len(self.threads)))
for rank in range(self.minrank, self.maxrank): for rank in range(self.minrank, self.maxrank):
@@ -181,7 +181,7 @@ class Indexer(object):
""" Index a single rank or table. `obj` describes the SQL to use """ Index a single rank or table. `obj` describes the SQL to use
for indexing. for indexing.
""" """
log.info("Starting {}".format(obj.name())) log.warning("Starting {}".format(obj.name()))
cur = self.conn.cursor(name='main') cur = self.conn.cursor(name='main')
cur.execute(obj.sql_index_sectors()) cur.execute(obj.sql_index_sectors())
@@ -201,7 +201,7 @@ class Indexer(object):
index_sql = obj.sql_index_place() index_sql = obj.sql_index_place()
min_grouped_tuples = total_tuples - len(self.threads) * 1000 min_grouped_tuples = total_tuples - len(self.threads) * 1000
next_info = 100 next_info = 100 if log.isEnabledFor(logging.INFO) else total_tuples + 1
for r in cur: for r in cur:
sector = r[0] sector = r[0]
@@ -228,7 +228,7 @@ class Indexer(object):
now = datetime.now() now = datetime.now()
done_time = (now - rank_start_time).total_seconds() done_time = (now - rank_start_time).total_seconds()
tuples_per_sec = done_tuples / done_time tuples_per_sec = done_tuples / done_time
print("Done {} in {} @ {:.3f} per second - {} ETA (seconds): {:.2f}" log.info("Done {} in {} @ {:.3f} per second - {} ETA (seconds): {:.2f}"
.format(done_tuples, int(done_time), .format(done_tuples, int(done_time),
tuples_per_sec, obj.name(), tuples_per_sec, obj.name(),
(total_tuples - done_tuples)/tuples_per_sec)) (total_tuples - done_tuples)/tuples_per_sec))
@@ -247,7 +247,7 @@ class Indexer(object):
rank_end_time = datetime.now() rank_end_time = datetime.now()
diff_seconds = (rank_end_time-rank_start_time).total_seconds() diff_seconds = (rank_end_time-rank_start_time).total_seconds()
log.info("Done {}/{} in {} @ {:.3f} per second - FINISHED {}\n".format( log.warning("Done {}/{} in {} @ {:.3f} per second - FINISHED {}\n".format(
done_tuples, total_tuples, int(diff_seconds), done_tuples, total_tuples, int(diff_seconds),
done_tuples/diff_seconds, obj.name())) done_tuples/diff_seconds, obj.name()))