Merge pull request #1758 from Expensify/main

Update expensify_prod branch
Expensify · May 30, 2024 · c335d91 · c335d91
2 parents fb76041 + a8aad30
commit c335d91
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/libstuff/SLog.cpp b/libstuff/SLog.cpp
@@ -5,6 +5,10 @@
 atomic<int> _g_SLogMask(LOG_INFO);
 
 void SLogStackTrace(int level) {
+    // If the level isn't set in the log mask, nothing more to do
+    if (!(_g_SLogMask & (1 << level))) {
+        return;
+    }
     // Output the symbols to the log
     void* callstack[100];
     int depth = backtrace(callstack, 100);

diff --git a/libstuff/libstuff.h b/libstuff/libstuff.h
@@ -115,9 +115,7 @@ typedef map<string, SString, STableComp> STable;
 // (for DEBUG) a stack trace at the same time. They can take, 1, 2, or all 3 of the components of an HTTP response as arguments.
 #define STHROW(...)                                           \
 do {                                                          \
-    if (_g_SLogMask & (1 << LOG_DEBUG)) {                     \
-        SLogStackTrace(LOG_DEBUG);                            \
-    }                                                         \
+    SLogStackTrace(LOG_DEBUG);                                \
     throw SException(__FILE__, __LINE__, false, __VA_ARGS__); \
 } while (false)