Merge branch 'mac-azure' of github.com:stream-labs/crash-handler into…

… mac-azure
stream-labs · Mar 26, 2020 · 05f3c23 · 05f3c23
2 parents d7b0b40 + 6c18131
commit 05f3c23
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 44 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -64,7 +64,7 @@ jobs:
 
 - job: 'MacOSX'
   pool:
-    vmImage: 'macos-10.15'
+    vmImage: 'macos-10.14'
   workspace:
     clean: all
 

diff --git a/crash-handler-process/logger.cpp b/crash-handler-process/logger.cpp
@@ -19,11 +19,11 @@
 #include <chrono>
 #include <sstream>
 #include <iomanip>
-#include <filesystem>
+// #include <filesystem>
 
 bool log_output_disabled = false;
 
-namespace fs = std::filesystem;
+// namespace fs = std::filesystem;
 std::ofstream log_output_file;
 
 const std::string getTimeStamp() 
@@ -45,27 +45,27 @@ const std::string getTimeStamp()
 
 void logging_start(std::wstring log_path)
 {
-    if( log_path.size() == 0 )
-        log_output_disabled = true;
+    // if( log_path.size() == 0 )
+    //     log_output_disabled = true;
 
-    if( !log_output_disabled ) 
-    {
-        try {
-            fs::path log_file = log_path;
-            fs::path log_file_old = log_file;
-            log_file_old.replace_extension("log.old");
+    // if( !log_output_disabled ) 
+    // {
+    //     try {
+    //         fs::path log_file = log_path;
+    //         fs::path log_file_old = log_file;
+    //         log_file_old.replace_extension("log.old");
 
-            fs::remove_all(log_file_old);
-            fs::rename(log_file, log_file_old); 
-        } catch (...) {
+    //         fs::remove_all(log_file_old);
+    //         fs::rename(log_file, log_file_old); 
+    //     } catch (...) {
 
-        }   
-        log_output_file.open( log_path, std::ios_base::out | std::ios_base::app);
-    }
+    //     }   
+    //     log_output_file.open( log_path, std::ios_base::out | std::ios_base::app);
+    // }
 }
 
 void logging_end()
 {
-    if( !log_output_disabled ) 
-        log_output_file.close();
+    // if( !log_output_disabled ) 
+    //     log_output_file.close();
 }
diff --git a/crash-handler-process/main.cpp b/crash-handler-process/main.cpp
@@ -144,38 +144,38 @@ std::string get_process_name(ProcessInfo pi)
 #endif
 	return "";
 }
-std::fstream open_file(std::string& file_path, std::fstream::openmode mode)
-{
-	return std::fstream(from_utf8_to_utf16_wide(file_path.c_str()), mode);
-}
+// std::fstream open_file(std::string& file_path, std::fstream::openmode mode)
+// {
+// 	return std::fstream(from_utf8_to_utf16_wide(file_path.c_str()), mode);
+// }
 bool kill(ProcessInfo pinfo, uint32_t code)
 {
 #ifdef WIN32
 	return TerminateProcess(reinterpret_cast<HANDLE>(pinfo.handle), code);
 #endif
 	return true;
 }
-static void check_pid_file(std::string& pid_path)
-{
-	std::fstream::openmode mode = std::fstream::in | std::fstream::binary;
-	std::fstream pid_file(open_file(pid_path, mode));
-	union
-	{
-		uint64_t pid;
-		char     pid_char[sizeof(uint64_t)];
-	};
-	if (!pid_file)
-		return;
-	pid_file.read(&pid_char[0], 8);
-	ProcessInfo pi = open_process(pid);
-	if (pi.handle == 0)
-		return;
-	std::string name = get_process_name(pi);
-	if (name.find("crash-handler-process.exe") != std::string::npos) {
-		kill(pi, -1);
-	}
-	close_process(pi);
-}
+// static void check_pid_file(std::string& pid_path)
+// {
+// 	std::fstream::openmode mode = std::fstream::in | std::fstream::binary;
+// 	std::fstream pid_file(open_file(pid_path, mode));
+// 	union
+// 	{
+// 		uint64_t pid;
+// 		char     pid_char[sizeof(uint64_t)];
+// 	};
+// 	if (!pid_file)
+// 		return;
+// 	pid_file.read(&pid_char[0], 8);
+// 	ProcessInfo pi = open_process(pid);
+// 	if (pi.handle == 0)
+// 		return;
+// 	std::string name = get_process_name(pi);
+// 	if (name.find("crash-handler-process.exe") != std::string::npos) {
+// 		kill(pi, -1);
+// 	}
+// 	close_process(pi);
+// }
 std::string get_temp_directory()
 {
 #ifdef WIN32