From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 25 Oct 2016 20:45:04 +0000 (+0200)
Subject: with this commit we pretty up an otherwise bloody useless error on typing: newServer... 
X-Git-Tag: dnsdist-1.1.0-beta2~52^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F4632%2Fhead;p=thirdparty%2Fpdns.git

with this commit we pretty up an otherwise bloody useless error on typing: newServer({"1.2.3.4", pool="primary"}). We do so in a pretty ugly way though.
The cause of the error is deep in the bowels of Lua and/or LuaWrapper. Even if we caught/fixed this error in a more karmic place, we'd still want to output
this error message. Also, dragons live there.
---

diff --git a/pdns/dnsdist-console.cc b/pdns/dnsdist-console.cc
index 1306bb8033..56bd5fb0c9 100644
--- a/pdns/dnsdist-console.cc
+++ b/pdns/dnsdist-console.cc
@@ -186,7 +186,6 @@ void doConsole()
               >
             >
           >(withReturn ? ("return "+line) : line);
-        
         if(ret) {
           if (const auto strValue = boost::get<shared_ptr<DownstreamState>>(&*ret)) {
             cout<<(*strValue)->getName()<<endl;
@@ -221,9 +220,13 @@ void doConsole()
       // tried to return something we don't understand
     }
     catch(const LuaContext::ExecutionErrorException& e) {
-      std::cerr << e.what(); 
+      if(!strcmp(e.what(),"invalid key to 'next'"))
+        std::cerr<<"Error parsing parameters, did you forget parameter name?";
+      else
+        std::cerr << e.what(); 
       try {
         std::rethrow_if_nested(e);
+
         std::cerr << std::endl;
       } catch(const std::exception& e) {
         // e is the exception that was thrown from inside the lambda
@@ -488,16 +491,19 @@ try
       // tried to return something we don't understand
     }
     catch(const LuaContext::ExecutionErrorException& e) {
-      response = "Error: " + string(e.what()) + ": ";
+      if(!strcmp(e.what(),"invalid key to 'next'"))
+        response = "Error: Parsing function parameters, did you forget parameter name?";
+      else
+        response = "Error: " + string(e.what());
       try {
         std::rethrow_if_nested(e);
       } catch(const std::exception& e) {
         // e is the exception that was thrown from inside the lambda
-        response+= string(e.what());
+        response+= ": " + string(e.what());
       }
       catch(const PDNSException& e) {
         // e is the exception that was thrown from inside the lambda
-        response += string(e.reason);
+        response += ": " + string(e.reason);
       }
     }
     catch(const LuaContext::SyntaxErrorException& e) {