Merge pull request #1741 from Expensify/main

Update expensify_prod branch

libstuff/libstuff.h

@@ -112,10 +112,12 @@ typedef map<string, SString, STableComp> STable;
 
 // An SException is an exception class that can represent an HTTP-like response, with a method line, headers, and a
 // body. The STHROW and STHROW_STACK macros will create an SException that logs it's file, line of creation, and
-// a stack trace at the same time. They can take, 1, 2, or all 3 of the components of an HTTP response as arguments.
+// (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 {                                                          \
-    SLogStackTrace(LOG_DEBUG);                                \
+    if (_g_SLogMask & (1 << LOG_DEBUG)) {                     \
+        SLogStackTrace(LOG_DEBUG);                            \
+    }                                                         \
     throw SException(__FILE__, __LINE__, false, __VA_ARGS__); \
 } while (false)