Better error handling

diff --git a/pdns/recursordist/settings/rust/src/web.rs b/pdns/recursordist/settings/rust/src/web.rs
index 8151c1a3ac25dfaa6bc138737f20e97f3f398aa0..d934f21456090ed0dfd04121555a6a595d90effd 100644 (file)
--- a/pdns/recursordist/settings/rust/src/web.rs
+++ b/pdns/recursordist/settings/rust/src/web.rs
@@ -266,13 +266,13 @@ async fn hello(
             }
             let pos = urls.iter().position(|x| String::from("/") + x == path);
             if pos.is_none() {
-                println!("{} not found", path);
+                eprintln!("{} {} not found", rust_request.method(), path);
             }
             if rustweb::serveStuff(&request, &mut response).is_err() {
                 // Return 404 not found response.
                 response.status = StatusCode::NOT_FOUND.as_u16();
                 response.body = NOTFOUND.to_vec();
-                println!("{} not found case 2", path);
+                eprintln!("{} {} not found case 2", rust_request.method(), path);
             }
         }
     }

diff --git a/pdns/recursordist/ws-recursor.cc b/pdns/recursordist/ws-recursor.cc
index b4fb291ea77802f9f14131dbba25491d817b7f11..7a1a326198f9adb366d4145ea64937e0d016452d 100644 (file)
--- a/pdns/recursordist/ws-recursor.cc
+++ b/pdns/recursordist/ws-recursor.cc
@@ -993,6 +993,12 @@ static void rustWrapper(const std::function<void(HttpRequest*, HttpResponse*)>&
     response.body = e.response().body;
     response.status = e.response().status;
   }
+  catch (const ApiException & e) {
+    response.setErrorResult(e.what(), 422);
+  }
+  catch (const JsonException & e) {
+    response.setErrorResult(e.what(), 422);
+  }
   fromCxxToRust(response, rustResponse);
 }