From f6f79ad41346ab31b6547e3a6aa9b22c40e7bb72 Mon Sep 17 00:00:00 2001
From: Adam Sutton <dev@adamsutton.me.uk>
Date: Wed, 4 Dec 2013 23:28:29 +0000
Subject: [PATCH] tvhlog: stop full debug by default if --trace specified

Often I want to enable trace (and debug) for a specific set of subsys,
but I had it configured to enable ALL debug if any debug related options
were spec'd (for compat). But this was a PITA and I kept doing
--trace blah --debug none just to get around it!
---
 src/main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main.c b/src/main.c
index 7252be9f..ea0c0d9d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -586,7 +586,8 @@ main(int argc, char **argv)
   if (isatty(2))
     log_options |= TVHLOG_OPT_DECORATE;
   if (opt_stderr || opt_syslog || opt_logpath) {
-    log_debug      = "all";
+    if (!opt_log_trace && !opt_log_debug)
+      log_debug      = "all";
     log_level      = LOG_DEBUG;
     if (opt_stderr)
       log_options   |= TVHLOG_OPT_DBG_STDERR;