HPCC-30298 Allow tracing detail level to be controlled by tracing flags

Signed-off-by: Gavin Halliday <[email protected]>
hpcc-systems · Sep 15, 2023 · 919059f · 919059f
1 parent 5a34bb0
commit 919059f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/system/jlib/jlog.cpp b/system/jlib/jlog.cpp
@@ -3383,10 +3383,18 @@ TraceFlags loadTraceFlags(const IPropertyTree *ptree, const std::initializer_lis
             attrName.clear().appendf("_%s", o.name);
         if (ptree->hasProp(attrName))
         {
-            if (ptree->getPropBool(attrName, false))
+            if (o.value <= TraceFlags::LevelMask)
+            {
+                dft &= ~TraceFlags::LevelMask;
                 dft |= o.value;
+            }
             else
-                dft &= ~o.value;
+            {
+                if (ptree->getPropBool(attrName, false))
+                    dft |= o.value;
+                else
+                    dft &= ~o.value;
+            }
         }
 
     }

diff --git a/system/jlib/jtrace.hpp b/system/jlib/jtrace.hpp
@@ -121,6 +121,12 @@ BITMASK_ENUM(TraceFlags);
 
 // Feature trace flags for hthor, thor and Roxie engines
 
+// Detail levels
+constexpr TraceFlags traceNone = TraceFlags::None;
+constexpr TraceFlags traceStandard = TraceFlags::Standard;
+constexpr TraceFlags traceDetailed = TraceFlags::Detailed;
+constexpr TraceFlags traceMax = TraceFlags::Max;
+
 // Common to several engines
 constexpr TraceFlags traceHttp = TraceFlags::flag1;
 constexpr TraceFlags traceSockets = TraceFlags::flag2;
@@ -158,6 +164,10 @@ struct TraceOption { const char * name; TraceFlags value; };
 
 constexpr std::initializer_list<TraceOption> roxieTraceOptions
 { 
+    TRACEOPT(traceNone),
+    TRACEOPT(traceStandard),
+    TRACEOPT(traceDetailed),
+    TRACEOPT(traceMax),
     TRACEOPT(traceHttp),
     TRACEOPT(traceSockets),
     TRACEOPT(traceCassandra),