Merge #1198

1198: XWayland: improve verbose logging r=AlanGriffiths a=wmww Improvements to the verbose logs generated by the XWayland frontend. Probably not interesting to anyone but me, but merging will make maintaining my branches simpler. Co-authored-by: William Wold <[email protected]> (cherry picked from commit ed1bc7b)
canonical · Feb 14, 2020 · 24e741c · 24e741c
1 parent 3e1f055
commit 24e741c
Show file tree

Hide file tree

Showing 6 changed files with 245 additions and 134 deletions.
diff --git a/src/server/frontend_xwayland/xwayland_log.h b/src/server/frontend_xwayland/xwayland_log.h
@@ -23,16 +23,9 @@
 
 namespace mir
 {
-inline void log_verbose(std::string const& message)
+inline auto verbose_xwayland_logging_enabled() -> bool
 {
-    if (getenv("MIR_X11_VERBOSE_LOG"))
-        log_info(message);
-}
-template <typename... Args>
-void log_verbose(char const* fmt, Args&&... args)
-{
-    if (getenv("MIR_X11_VERBOSE_LOG"))
-        log_info(fmt, std::forward<Args>(args)...);
+    return getenv("MIR_X11_VERBOSE_LOG");
 }
 } /* mir */
 

diff --git a/src/server/frontend_xwayland/xwayland_server.cpp b/src/server/frontend_xwayland/xwayland_server.cpp
@@ -173,7 +173,6 @@ bool set_cloexec(int fd, bool cloexec) {
         mir::fatal_error("fcntl failed");
         return false;
     }
-    mir::log_info("set ok");
     return true;
 }
 }