Skip to content

Commit 1858c60

Browse files
committed
Improve ImageArray logging further.
1 parent ce93ae4 commit 1858c60

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

Remote Server/ServerForm.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6432,6 +6432,7 @@ private static void ReturnImageArrayBase64(RequestData requestData)
64326432
/// </remarks>
64336433
private static void ReturnImageArray(RequestData requestData)
64346434
{
6435+
LogMessage(0, 0, 0, "ReturnImageArray", $"Entered ReturnImageArray");
64356436
try
64366437
{
64376438
Array deviceResponse;
@@ -6441,7 +6442,7 @@ private static void ReturnImageArray(RequestData requestData)
64416442
long lastTime = 0;
64426443

64436444
// Release memory used by the previous image before acquiring the next
6444-
LogMessage(0, 0, 0, "ReturnImageArray", $"Before setting LastImageArray to null");
6445+
LogMessage(0, 0, 0, "ReturnImageArray", $"Before setting LastImageArray to null...");
64456446
ActiveObjects[requestData.DeviceKey].LastImageArray = null;
64466447
LogMessage(0, 0, 0, "ReturnImageArray", $"Set LastImageArray to null OK");
64476448
GC.Collect();
@@ -6455,13 +6456,20 @@ private static void ReturnImageArray(RequestData requestData)
64556456
Stopwatch sw = new(); // Create a stopwatch to time the process
64566457

64576458
// Determine whether the client supports compressed responses by testing the Accept-Encoding header, if present. GZip compression will be favoured over Deflate if the client accepts both methods
6459+
LogMessage(0, 0, 0, "ReturnImageArray", $"Before getting accept coding...");
64586460
string[] acceptEncoding = requestData.Request.Headers.GetValues("Accept-Encoding"); // Get the Accept-Encoding header, if present
64596461
LogMessage(0, 0, 0, "ReturnImageArray", $"Got accept coding OK");
64606462
if (acceptEncoding != null) // There is an Accept-Encoding header so check whether it has the compression modes that we support
64616463
{
6464+
LogMessage(0, 0, 0, "ReturnImageArray", $"Accept coding is not null");
64626465
if (acceptEncoding[0].Contains("deflate", StringComparison.InvariantCultureIgnoreCase)) compressionType = SharedConstants.ImageArrayCompression.Deflate; // Test
64636466
if (acceptEncoding[0].Contains("gzip", StringComparison.InvariantCultureIgnoreCase)) compressionType = SharedConstants.ImageArrayCompression.GZip;
64646467
}
6468+
else
6469+
{
6470+
LogMessage(0, 0, 0, "ReturnImageArray", $"Accept coding is null");
6471+
}
6472+
LogMessage(0, 0, 0, "ReturnImageArray", $"Processed Accept coding OK");
64656473
if (DebugTraceState) LogMessage1(requestData, requestData.Elements[SharedConstants.URL_ELEMENT_METHOD], $"Response compression type: {compressionType}");
64666474

64676475
try

0 commit comments

Comments
 (0)