dnsdist: Convert Lua selectors to structured logging

Signed-off-by: Remi Gacogne <remi.gacogne@powerdns.com>

diff --git a/pdns/dnsdistdist/dnsdist-rules-factory.hh b/pdns/dnsdistdist/dnsdist-rules-factory.hh
index e540c0207be3db0b0ea28d83da90242ac6fff7c6..91f0fc7db4cdd0054a3a682bd83ee903931c5925 100644 (file)
--- a/pdns/dnsdistdist/dnsdist-rules-factory.hh
+++ b/pdns/dnsdistdist/dnsdist-rules-factory.hh
@@ -1295,10 +1295,12 @@ public:
       return d_func(dq);
     }
     catch (const std::exception& e) {
-      warnlog("LuaRule failed inside Lua: %s", e.what());
+      SLOG(warnlog("LuaRule failed inside Lua: %s", e.what()),
+           dq->getLogger()->error(Logr::Warning, e.what(), "LuaRule failed inside Lua"));
     }
     catch (...) {
-      warnlog("LuaRule failed inside Lua: [unknown exception]");
+      SLOG(warnlog("LuaRule failed inside Lua: [unknown exception]"),
+           dq->getLogger()->info(Logr::Warning, "LuaRule failed inside Lua with an unknown exception"));
     }
     return false;
   }
@@ -1327,10 +1329,12 @@ public:
       return d_func(&dqffi);
     }
     catch (const std::exception& e) {
-      warnlog("LuaFFIRule failed inside Lua: %s", e.what());
+      SLOG(warnlog("LuaFFIRule failed inside Lua: %s", e.what()),
+           dq->getLogger()->error(Logr::Warning, e.what(), "LuaFFIRule failed inside Lua"));
     }
     catch (...) {
-      warnlog("LuaFFIRule failed inside Lua: [unknown exception]");
+      SLOG(warnlog("LuaFFIRule failed inside Lua: [unknown exception]"),
+           dq->getLogger()->info(Logr::Warning, "LuaFFIRule failed inside Lua with an unknown exception"));
     }
     return false;
   }
@@ -1373,10 +1377,12 @@ public:
       return state.d_func(&dqffi);
     }
     catch (const std::exception& e) {
-      warnlog("LuaFFIPerthreadRule failed inside Lua: %s", e.what());
+      SLOG(warnlog("LuaFFIPerthreadRule failed inside Lua: %s", e.what()),
+           dq->getLogger()->error(Logr::Warning, e.what(), "LuaFFIPerThreadRule failed inside Lua"));
     }
     catch (...) {
-      warnlog("LuaFFIPerThreadRule failed inside Lua: [unknown exception]");
+      SLOG(warnlog("LuaFFIPerThreadRule failed inside Lua: [unknown exception]"),
+           dq->getLogger()->info(Logr::Warning, "LuaFFIPerThreadRule failed inside Lua with an unknown exception"));
     }
     return false;
   }