Merge remote-tracking branch 'origin/master' into flushRace

Author: dgreatwood

.github/workflows/windows.yaml

@@ -344,6 +344,84 @@ jobs:
         # Use the following to run just a single test (e.g. http_server_test)
         #   build/tests/run_http_server_test
 
+        # Test for Windows ETW Log Entries
+
+        cd "$savedpwd";
+
+        logman start -ets Pistache -p "Pistache-Provider" 0 0 -o pistache.etl
+
+        cd "build/tests";
+        ./run_cookie_test_3.exe;
+        cd "..\..";
+        logman stop Pistache -ets
+
+        $fst5 =
+          Get-WinEvent -path "pistache.etl" -Oldest | Select-Object -First 5
+
+        cd "$savedpwd"
+
+        $id_102_count=0;
+        $id_102_start_msg_count=0;
+        $id_1_count=0;
+        foreach ($evitm in $fst5) {
+            if ($evitm.Id -eq 102) {
+                $id_102_count++;
+
+                $ldn=$evitm.LevelDisplayName;
+                if (! ($ldn -contains "Information")) {
+                    Write-Error "log LevelDisplayName not as expected: $ldn";
+                    throw "Windows log LevelDisplayName not as expected";
+                }
+
+                $msg=$evitm.Message;
+                if ((! $id_102_start_msg_count) -and
+                  ((! ("$msg" -like "*INFO*")) -or
+                   (! ("$msg" -like "*Pistache start*")))) {
+                    Write-Warning "log msg not as expected: $msg";
+                }
+                else {
+                    $id_102_start_msg_count++;
+                }
+            }
+
+            if ($evitm.Id -eq 1) {
+                $id_1_count++
+
+                $ldn=$evitm.LevelDisplayName;
+                if (! ($ldn -contains "Verbose")) {
+                    Write-Error "log LevelDisplayName not as expected: $ldn"
+                    throw "Windows log LevelDisplayName not as expected"
+                }
+
+                $msg=$evitm.Message;
+                if ((! ("$msg" -like "*DEBUG*")) -or
+                    (! ("$msg" -like "*PSTCH*"))) {
+                    Write-Error "log msg not as expected: $msg";
+                    throw "Windows log message not as expected"
+                }
+            }
+        }
+
+        if (! $id_102_count) {
+            throw "No Id=102 / INFO log messages found"
+        }
+        if (! $id_102_start_msg_count) {
+            throw "No Id=102 / INFO Pistache start message found"
+        }
+        if ($env:mtrx_def_debug -eq "false") {
+            if ($id_1_count) {
+                throw "Id=1 / DEBUG log messages found unexpectedly"
+            }
+        }
+        else {
+            if (! $id_1_count) {
+                throw "No Id=1 / DEBUG log messages found"
+            }
+        }
+
+        Write-Host "Logging test passed"
+
+
     - name: Install
       env:
         mtrx_compiler: ${{ matrix.compiler }}

src/common/pist_sockfns.cc

@@ -252,38 +252,44 @@ int pist_sock_startup_check()
     if (wsastartup_res == 0)
     {
         lWsaStartupDone = true;
+
+        // Note: By doing this log here, we ensure there is at least one
+        // message in the log. Apart from anything else, this can be used by
+        // github workflows to check that logging is working
+        PS_LOG_INFO("WSAStartup Succeeded");
+
         return(0); // success
     }
 
     switch(wsastartup_res)
     {
     case WSASYSNOTREADY:
-        PS_LOG_DEBUG("WSAStartup WSASYSNOTREADY");
+        PS_LOG_WARNING("WSAStartup WSASYSNOTREADY");
         errno = ENETUNREACH;
         break;
 
     case WSAVERNOTSUPPORTED:
-        PS_LOG_DEBUG("WSAStartup WSAVERNOTSUPPORTED");
+        PS_LOG_WARNING("WSAStartup WSAVERNOTSUPPORTED");
         errno = EOPNOTSUPP;
         break;
 
     case WSAEINPROGRESS:
-        PS_LOG_DEBUG("WSAStartup WSAEINPROGRESS");
+        PS_LOG_INFO("WSAStartup WSAEINPROGRESS");
         errno = EINPROGRESS;
         break;
 
     case WSAEPROCLIM:
-        PS_LOG_DEBUG("WSAStartup WSAEPROCLIM");
+        PS_LOG_WARNING("WSAStartup WSAEPROCLIM");
         errno = EMFILE; // too many files
         break;
 
     case WSAEFAULT:
-        PS_LOG_DEBUG("WSAStartup WSAEFAULT");
+        PS_LOG_WARNING("WSAStartup WSAEFAULT");
         errno = EFAULT;
         break;
 
     default:
-        PS_LOG_DEBUG_ARGS("Unexpected WSAStartup error %d:", wsastartup_res);
+        PS_LOG_WARNING_ARGS("Unexpected WSAStartup error %d:", wsastartup_res);
         errno = EIO;
         break;
     }

version.txt

@@ -1 +1 @@
-0.5.1.20250305
+0.5.2.20250309