aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorp0358 <p0358@users.noreply.github.com>2022-01-01 02:51:42 +0100
committerp0358 <p0358@users.noreply.github.com>2022-01-01 02:51:42 +0100
commit8327cd3e13f80cde3c0b0f6482e400793e67007f (patch)
tree136ec4226d33e1c81e7215e2e79e0fe3e7fb6b18
parent23a7ac1ef5c3e5f35c40f738d9140311ef1d3fdb (diff)
downloadNorthstarLauncher-8327cd3e13f80cde3c0b0f6482e400793e67007f.tar.gz
NorthstarLauncher-8327cd3e13f80cde3c0b0f6482e400793e67007f.zip
log curl output to the windows console (I think it was intended to work, but it doesn't if you use original exe before this change)
-rw-r--r--NorthstarDedicatedTest/logging.cpp1
-rw-r--r--NorthstarDedicatedTest/masterserver.cpp3
2 files changed, 3 insertions, 1 deletions
diff --git a/NorthstarDedicatedTest/logging.cpp b/NorthstarDedicatedTest/logging.cpp
index e345f2e8..312d5345 100644
--- a/NorthstarDedicatedTest/logging.cpp
+++ b/NorthstarDedicatedTest/logging.cpp
@@ -186,6 +186,7 @@ void InitialiseLogging()
AllocConsole();
freopen("CONOUT$", "w", stdout);
+ freopen("CONOUT$", "w", stderr);
spdlog::default_logger()->set_pattern("[%H:%M:%S] [%l] %v");
spdlog::flush_on(spdlog::level::info);
diff --git a/NorthstarDedicatedTest/masterserver.cpp b/NorthstarDedicatedTest/masterserver.cpp
index 98189733..01f4bc8e 100644
--- a/NorthstarDedicatedTest/masterserver.cpp
+++ b/NorthstarDedicatedTest/masterserver.cpp
@@ -95,7 +95,8 @@ void MasterServerManager::SetCommonHttpClientOptions(CURL* curl)
{
curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
- if (CommandLine()->CheckParm("-msinsecure"))
+ //curl_easy_setopt(curl, CURLOPT_STDERR, stdout);
+ if (CommandLine()->FindParm("-msinsecure")) // TODO: this check doesn't seem to work
{
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);