From: Carl Hetherington <cth@carlh.net>
Date: Tue, 1 Nov 2022 20:11:40 +0000 (+0100)
Subject: Enable some debug logging for TMS upload.
X-Git-Tag: v2.16.33~26
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=9c6d757fc6ff188521719cad9bf2cd494bb4edd8;p=dcpomatic.git

Enable some debug logging for TMS upload.
---

diff --git a/src/lib/curl_uploader.cc b/src/lib/curl_uploader.cc
index 9416a17fb..389a5d6de 100644
--- a/src/lib/curl_uploader.cc
+++ b/src/lib/curl_uploader.cc
@@ -20,6 +20,7 @@
 
 
 #include "curl_uploader.h"
+#include "dcpomatic_log.h"
 #include "exceptions.h"
 #include "config.h"
 #include "cross.h"
@@ -43,6 +44,13 @@ read_callback (void* ptr, size_t size, size_t nmemb, void* object)
 }
 
 
+static int
+curl_debug_shim (CURL* curl, curl_infotype type, char* data, size_t size, void* userp)
+{
+	return reinterpret_cast<CurlUploader*>(userp)->debug(curl, type, data, size);
+}
+
+
 CurlUploader::CurlUploader (function<void (string)> set_status, function<void (float)> set_progress)
 	: Uploader (set_status, set_progress)
 {
@@ -61,6 +69,9 @@ CurlUploader::CurlUploader (function<void (string)> set_status, function<void (f
 	if (!Config::instance()->tms_passive()) {
 		curl_easy_setopt(_curl, CURLOPT_FTPPORT, "-");
 	}
+	curl_easy_setopt(_curl, CURLOPT_VERBOSE, 1L);
+	curl_easy_setopt(_curl, CURLOPT_DEBUGFUNCTION, curl_debug_shim);
+	curl_easy_setopt(_curl, CURLOPT_DEBUGDATA, this);
 }
 
 
@@ -116,3 +127,14 @@ CurlUploader::read_callback (void* ptr, size_t size, size_t nmemb)
 
 	return r;
 }
+
+
+int
+CurlUploader::debug(CURL *, curl_infotype type, char* data, size_t size)
+{
+	if (type == CURLINFO_TEXT && size > 0) {
+		LOG_GENERAL("CurlUploader: %1", string(data, size - 1));
+	}
+	return 0;
+}
+
diff --git a/src/lib/curl_uploader.h b/src/lib/curl_uploader.h
index ea017eb83..4ee221f08 100644
--- a/src/lib/curl_uploader.h
+++ b/src/lib/curl_uploader.h
@@ -31,6 +31,7 @@ public:
 	~CurlUploader ();
 
 	size_t read_callback (void* ptr, size_t size, size_t nmemb);
+	int debug(CURL* curl, curl_infotype type, char* data, size_t size);
 
 protected:
 	void create_directory (boost::filesystem::path directory) override;