From 0ca2bbccf1623de12322f2990b4465cd69ff4594 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 4 Apr 2021 03:43:14 +0100
Subject: [PATCH] wdt: Improve/fix some JS logging

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 apitest/apitest.rs | 2 +-
 wdriver/wdriver.rs | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/apitest/apitest.rs b/apitest/apitest.rs
index 211ef5b5..03e2a235 100644
--- a/apitest/apitest.rs
+++ b/apitest/apitest.rs
@@ -858,7 +858,7 @@ pub fn setup_core<O>(module_paths: &[&str], early_args: EarlyArgPredicate) ->
   }
 
   builder
-    .filter_level(log::LevelFilter::Info)
+    .filter_level(log::LevelFilter::Debug)
     .parse_env("OTTER_TEST_LOG")
     .init();
   debug!("starting");
diff --git a/wdriver/wdriver.rs b/wdriver/wdriver.rs
index 4492425f..2e54e4e5 100644
--- a/wdriver/wdriver.rs
+++ b/wdriver/wdriver.rs
@@ -161,7 +161,7 @@ fn fetch_log(driver: &T4d, name: &str) {
     for ent in got.value().as_array()
       .ok_or(anyhow!("saved isn't an array?"))?
     {
-      #[derive(Deserialize)]
+      #[derive(Deserialize,Debug)]
       struct LogEnt(String, Vec<JsV>);
       impl fmt::Display for LogEnt {
         #[throws(fmt::Error)]
@@ -312,6 +312,10 @@ impl<'g> WindowGuard<'g> {
     log
   }
 
+  #[throws(AE)]
+  pub fn fetch_js_log(&self) {
+    fetch_log(&self.su.driver, &self.w.name)?
+  }
 }
 
 #[ext(pub)]
-- 
2.30.2