Skip to content

Commit fdddd61

Browse files
committed
Generalizer: Show some more information in log level info
Now we can see SQL queries and generalizers run with some timing info already in log level info.
1 parent 71a1df7 commit fdddd61

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/gen/osm2pgsql-gen.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ class genproc_t
296296

297297
int app_run_gen()
298298
{
299-
log_debug("Running configured generalizer (run {})...", ++m_gen_run);
299+
log_debug("Configuring generalizer...");
300300

301301
if (lua_type(lua_state(), 1) != LUA_TSTRING) {
302302
throw std::runtime_error{"Argument #1 to 'run_gen' must be a "
@@ -326,15 +326,16 @@ class genproc_t
326326
auto generalizer =
327327
create_generalizer(strategy, &db_connection, &params);
328328

329-
log_debug("Generalizer '{}' ({}) initialized.", generalizer->name(),
330-
generalizer->strategy());
329+
log_info("Running generalizer '{}' ({})...", generalizer->name(),
330+
generalizer->strategy());
331331

332332
if (m_append) {
333333
params.set("delete_existing", true);
334334
}
335335

336336
write_to_debug_log(params, "Params (after initialization):");
337337

338+
util::timer_t timer_gen;
338339
if (generalizer->on_tiles()) {
339340
process_tiles(db_connection, params, generalizer.get());
340341
} else {
@@ -353,8 +354,8 @@ class genproc_t
353354
std::chrono::duration_cast<std::chrono::milliseconds>(
354355
timer.elapsed())));
355356
}
356-
log_debug("Finished generalizer '{}' (run {}).", generalizer->name(),
357-
m_gen_run);
357+
log_info("Finished generalizer '{}' in {}.", generalizer->name(),
358+
util::human_readable_duration(timer_gen.stop()));
358359

359360
return 0;
360361
}
@@ -402,16 +403,16 @@ class genproc_t
402403
queries.emplace_back("COMMIT");
403404
}
404405

405-
log_debug("Running SQL commands: {}.", description);
406+
log_info("Running SQL commands: {}.", description);
406407

407408
util::timer_t timer_sql;
408409
pg_conn_t const db_connection{m_conninfo};
409410
for (auto const &query : queries) {
410411
log_debug("Running sql: {}", query);
411412
db_connection.exec(query);
412413
}
413-
log_debug("SQL commands took {}.",
414-
util::human_readable_duration(timer_sql.stop()));
414+
log_info("Finished SQL commands in {}.",
415+
util::human_readable_duration(timer_sql.stop()));
415416

416417
return 0;
417418
}
@@ -538,7 +539,6 @@ class genproc_t
538539

539540
std::string m_conninfo;
540541
std::string m_dbschema;
541-
std::size_t m_gen_run = 0;
542542
uint32_t m_jobs;
543543
bool m_append;
544544
bool m_updatable;

0 commit comments

Comments
 (0)