Allow overriding Logging::Guard to dump stack backtraces as well.

1 files changed, 16 insertions, 0 deletions

diff --git a/lib/common/Logging.h b/lib/common/Logging.h
index 4ddf760d..1fcbe59e 100644
--- a/lib/common/Logging.h
+++ b/lib/common/Logging.h
@@ -303,17 +303,33 @@ class Logging
 	{
 		private:
 		Log::Level mOldLevel;
+		static int sGuardCount;
+		static Log::Level sOriginalLevel;
 
 		public:
 		Guard(Log::Level newLevel)
 		{
 			mOldLevel = Logging::GetGlobalLevel();
+			if(sGuardCount == 0)
+			{
+				sOriginalLevel = mOldLevel;
+			}
+			sGuardCount++;
 			Logging::SetGlobalLevel(newLevel);
 		}
 		~Guard()
 		{
+			sGuardCount--;
 			Logging::SetGlobalLevel(mOldLevel);
 		}
+
+		static bool IsActive() { return (sGuardCount > 0); }
+		static Log::Level GetOriginalLevel() { return sOriginalLevel; }
+		static bool IsGuardingFrom(Log::Level originalLevel)
+		{
+			return IsActive() &&
+				(int)sOriginalLevel >= (int)originalLevel;
+		}
 	};
 
 	class Tagger