put limit on log lines app keeps for Sentry

Author: summeroff

obs-studio-server/source/nodeobs_api.cpp

@@ -2082,17 +2082,17 @@ double OBS_API::getMemoryUsage()
 	return (double)os_get_proc_resident_size() / (1024.0 * 1024.0);
 }
 
-const std::vector<std::string> &OBS_API::getOBSLogErrors()
+std::deque<std::string> &OBS_API::getOBSLogErrors()
 {
 	return logReport.errors;
 }
 
-const std::vector<std::string> &OBS_API::getOBSLogWarnings()
+std::deque<std::string> &OBS_API::getOBSLogWarnings()
 {
 	return logReport.warnings;
 }
 
-std::queue<std::string> &OBS_API::getOBSLogGeneral()
+std::deque<std::string> &OBS_API::getOBSLogGeneral()
 {
 	return logReport.general;
 }

obs-studio-server/source/nodeobs_api.h

@@ -28,7 +28,7 @@
 #include <string.h>
 #include <string>
 #include <vector>
-#include <queue>
+#include <deque>
 #include "nodeobs_configManager.hpp"
 #include "nodeobs_service.h"
 #include "util-osx.hpp"
@@ -44,27 +44,33 @@ class OBS_API {
 
 public:
 	struct LogReport {
-		static const int MaximumGeneralMessages = 150;
+		static const int MaximumMessages = 150;
 
 		void push(std::string message, int logLevel)
 		{
-			general.push(message);
-			if (general.size() >= MaximumGeneralMessages) {
-				general.pop();
+			general.push_back(message);
+			if (general.size() > MaximumMessages) {
+				general.pop_front();
 			}
 
 			if (logLevel == LOG_ERROR) {
 				errors.push_back(message);
+				if (errors.size() > MaximumMessages) {
+					errors.pop_front();
+				}
 			}
 
 			if (logLevel == LOG_WARNING) {
 				warnings.push_back(message);
+				if (warnings.size() > MaximumMessages) {
+					warnings.pop_front();
+				}
 			}
 		}
 
-		std::vector<std::string> errors;
-		std::vector<std::string> warnings;
-		std::queue<std::string> general;
+		std::deque<std::string> errors;
+		std::deque<std::string> warnings;
+		std::deque<std::string> general;
 	};
 
 	struct OutputStats {
@@ -130,9 +136,9 @@ class OBS_API {
 	static double getMemoryUsage();
 	static void getCurrentOutputStats(obs_output_t *output, OBS_API::OutputStats &outputStats);
 
-	static const std::vector<std::string> &getOBSLogErrors();
-	static const std::vector<std::string> &getOBSLogWarnings();
-	static std::queue<std::string> &getOBSLogGeneral();
+	static std::deque<std::string> &getOBSLogErrors();
+	static std::deque<std::string> &getOBSLogWarnings();
+	static std::deque<std::string> &getOBSLogGeneral();
 
 	static std::string getCurrentVersion();
 	static std::string getUsername();

obs-studio-server/source/util-crashmanager.cpp

@@ -1011,23 +1011,27 @@ nlohmann::json util::CrashManager::RequestOBSLog(OBSLogType type)
 	switch (type) {
 	case OBSLogType::Errors: {
 		auto &errors = OBS_API::getOBSLogErrors();
-		for (auto &msg : errors)
-			result.push_back(msg);
+		while (!errors.empty()) {
+			result.push_back(errors.front());
+			errors.pop_front();
+		}
 		break;
 	}
 
 	case OBSLogType::Warnings: {
 		auto &warnings = OBS_API::getOBSLogWarnings();
-		for (auto &msg : warnings)
-			result.push_back(msg);
+		while (!warnings.empty()) {
+			result.push_back(warnings.front());
+			warnings.pop_front();
+		}
 		break;
 	}
 
 	case OBSLogType::General: {
 		auto &general = OBS_API::getOBSLogGeneral();
 		while (!general.empty()) {
 			result.push_back(general.front());
-			general.pop();
+			general.pop_front();
 		}
 
 		break;