Handle file-related errors when loading Lua scripts

diff --git a/pdns/lua-base4.cc b/pdns/lua-base4.cc
index a2da41bb75f5ecb20f482f2d7bb1be9aae915fb3..c82c93a047ad2be591e4ea64f6d180a235dab675 100644 (file)
--- a/pdns/lua-base4.cc
+++ b/pdns/lua-base4.cc
@@ -1,3 +1,4 @@
+#include <cassert>
 #include <fstream>
 #include <unordered_set>
 #include <unordered_map>
@@ -17,18 +18,17 @@
 BaseLua4::BaseLua4() {
 }
 
-int BaseLua4::loadFile(const std::string& fname)
+void BaseLua4::loadFile(const std::string& fname)
 {
-  int ret = 0;
   std::ifstream ifs(fname);
   if (!ifs) {
-    ret = errno;
-    SLOG(g_log << Logger::Error << "Unable to read configuration file from '" << fname << "': " << stringerror(ret) << endl,
-         g_slog->withName("lua")->error(Logr::Error, ret, "Unable to read configuration file", "file", Logging::Loggable(fname)));
-    return ret;
+    auto ret = errno;
+    auto msg = stringerror(ret);
+    SLOG(g_log << Logger::Error << "Unable to read configuration file from '" << fname << "': " << msg << endl,
+         g_slog->withName("lua")->error(Logr::Error, ret, "Unable to read configuration file", "file", Logging::Loggable(fname), "msg", Logging::Loggable(msg)));
+    throw std::runtime_error(msg);
   }
   loadStream(ifs);
-  return 0;
 };
 
 void BaseLua4::loadString(const std::string &script) {

diff --git a/pdns/lua-base4.hh b/pdns/lua-base4.hh
index 9394de4f8466c5390d8763f9a4e3b09a573956fc..1dbf62eecb39cca01a38d827ca7f5e5f3903c8b6 100644 (file)
--- a/pdns/lua-base4.hh
+++ b/pdns/lua-base4.hh
@@ -13,7 +13,7 @@ protected:
 
 public:
   BaseLua4();
-  int loadFile(const std::string &fname);
+  void loadFile(const std::string &fname);
   void loadString(const std::string &script);
   void loadStream(std::istream &is);
   virtual ~BaseLua4(); // this is so unique_ptr works with an incomplete type

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index 48685818dc42b52785f42efbee128414e26ce015..c248fcfc8b2d53bf8c1e26d474e359e0df2dcfdc 100644 (file)
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -2957,9 +2957,11 @@ static RecursorControlChannel::Answer* doReloadLuaScript()
     }
     else {
       t_pdl = std::make_shared<RecursorLua4>();
-      int err = t_pdl->loadFile(fname);
-      if (err != 0) {
-        string msg = std::to_string(RecThreadInfo::id()) + " Retaining current script, could not read '" + fname + "': " + stringerror(err);
+      try {
+        t_pdl->loadFile(fname);
+      }
+      catch (std::runtime_error& ex) {
+        string msg = std::to_string(RecThreadInfo::id()) + " Retaining current script, could not read '" + fname + "': " + ex.what();
         g_log << Logger::Error << msg << endl;
         return new RecursorControlChannel::Answer{1, msg + "\n"};
       }