Adopting utl::log()

.pkg

@@ -13,7 +13,7 @@
 [utl]
   url=git@github.com:motis-project/utl.git
   branch=master
-  commit=368fdcb8326ced5bb151b60c09a07c2e5f09bf55
+  commit=69e700e03ae3d385304d754cf57877528bc591ef
 [miniz]
   url=git@github.com:motis-project/miniz.git
   branch=master

include/nigiri/footpath.h

@@ -34,9 +34,9 @@ struct footpath {
                     kDurationBits,
                 "station index overflow");
     if (duration > kMaxDuration) {
-      [[unlikely]] nigiri::log(log_lvl::error, "footpath",
-                               "footpath overflow: {} > {} adjusted to {}",
-                               duration, kMaxDuration, this->duration());
+      [[unlikely]] utl::error("footpath",
+                              "footpath overflow: {} > {} adjusted to {}",
+                              duration, kMaxDuration, this->duration());
     }
   }
 

include/nigiri/timetable.h

@@ -52,8 +52,8 @@ struct timetable {
         transfer_time_.emplace_back(l.transfer_time_);
         parents_.emplace_back(l.parent_);
       } else {
-        log(log_lvl::error, "timetable.register_location",
-            "duplicate station {}", l.id_);
+        utl::error("timetable.register_location", "duplicate station {}",
+                   l.id_);
       }
 
       assert(names_.size() == next_idx + 1);

src/abi.cc

@@ -61,7 +61,7 @@ nigiri_timetable_t* nigiri_load_from_dir(nigiri::loader::dir const& d,
   auto const c =
       utl::find_if(loaders, [&](auto&& l) { return l->applicable(d); });
   utl::verify(c != end(loaders), "no loader applicable to the given file(s)");
-  nigiri::log(nigiri::log_lvl::info, "main",
+  utl::info("main",
               "loading nigiri timetable with configuration {}", (*c)->name());
 
   auto t = new nigiri_timetable_t;
@@ -267,11 +267,9 @@ void nigiri_update_with_rt_from_buf(const nigiri_timetable_t* t,
   try {
     nigiri::rt::gtfsrt_update_buf(*t->tt, *t->rtt, src, tag, protobuf);
   } catch (std::exception const& e) {
-    nigiri::log(nigiri::log_lvl::error, "main",
-                "GTFS-RT update error (tag={}) {}", tag, e.what());
+    utl::error("main", "GTFS-RT update error (tag={}) {}", tag, e.what());
   } catch (...) {
-    nigiri::log(nigiri::log_lvl::error, "main",
-                "Unknown GTFS-RT update error (tag={})", tag);
+    utl::error("main", "Unknown GTFS-RT update error (tag={})", tag);
   }
   t->rtt->reset_change_callback();
 }