Merge pull request #777 from openziti/issue-776-feedback-timeout-too-…

…short set feedback timeout to 60s
openziti · Dec 20, 2024 · 53eef96 · 53eef96
2 parents 3942e50 + 6a173bb
commit 53eef96
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 8 deletions.
diff --git a/Installer/build.ps1 b/Installer/build.ps1
@@ -28,7 +28,7 @@ $ADV_INST_HOME = "C:\Program Files (x86)\Caphyon\Advanced Installer ${ADV_INST_V
 $SIGNTOOL="${ADV_INST_HOME}\third-party\winsdk\x64\signtool.exe"
 $ADVINST = "${ADV_INST_HOME}\bin\x86\AdvancedInstaller.com"
 $ADVPROJECT = "${scriptPath}\ZitiDesktopEdge.aip"
-$ZITI_EDGE_TUNNEL_VERSION="v1.3.2"
+$ZITI_EDGE_TUNNEL_VERSION="v1.3.3"
 
 echo "Cleaning previous build folder if it exists"
 Remove-Item "${buildPath}" -r -ErrorAction Ignore

diff --git a/ZitiDesktopEdge.Client/ServiceClient/MonitorClient.cs b/ZitiDesktopEdge.Client/ServiceClient/MonitorClient.cs
@@ -144,7 +144,7 @@ async public Task<MonitorServiceStatusEvent> StatusAsync() {
         async public Task<MonitorServiceStatusEvent> CaptureLogsAsync() {
             ActionEvent action = new ActionEvent() { Op = "CaptureLogs", Action = "Normal" };
             await sendMonitorClientAsync(action);
-            return await readMonitorClientAsync<MonitorServiceStatusEvent>(ipcReader);
+            return await readMonitorClientAsync<MonitorServiceStatusEvent>(ipcReader, TimeSpan.FromSeconds(60));
         }
 
         async public Task<SvcResponse> SetLogLevelAsync(string level) {

diff --git a/release-notes.md b/release-notes.md
@@ -1,3 +1,19 @@
+# Release 2.5.2.3
+## What's New
+* nothing - bugfix
+
+## Other changes
+* none
+
+## Bugs fixed:
+* [issue 776 - Asking for feedback log takes too long](https://github.com/openziti/desktop-edge-win/issues/776)
+
+## Dependencies
+
+* ziti-tunneler: v1.3.3
+* ziti-sdk:      1.3.2
+* tlsuv:         v0.32.9[OpenSSL 3.3.1 4 Jun 2024]
+
 # Release 2.5.2.2
 
 ## What's New

diff --git a/release-streams/beta.json b/release-streams/beta.json
@@ -1,12 +1,12 @@
 {
-  "name": "2.5.1.2",
-  "tag_name": "2.5.1.2",
-  "published_at": "2024-12-10T10:39:52Z",
+  "name": "2.5.2.3",
+  "tag_name": "2.5.2.3",
+  "published_at": "2024-12-20T07:12:05Z",
   "installation_critical": false,
   "assets": [
     {
-      "name": "Ziti.Desktop.Edge.Client-2.5.1.2.exe",
-      "browser_download_url": "https://github.com/openziti/desktop-edge-win/releases/download/2.5.1.2/Ziti.Desktop.Edge.Client-2.5.1.2.exe"
+      "name": "Ziti.Desktop.Edge.Client-2.5.2.3.exe",
+      "browser_download_url": "https://github.com/openziti/desktop-edge-win/releases/download/2.5.2.3/Ziti.Desktop.Edge.Client-2.5.2.3.exe"
     }
   ]
 }
diff --git a/version b/version
@@ -1 +1 @@
-2.5.2.2
+2.5.2.3