From cea9b4879e722d138e0f16b552c53b9bb2f8cec9 Mon Sep 17 00:00:00 2001 From: kasemir Date: Mon, 29 Jun 2026 12:01:37 -0400 Subject: [PATCH] ArchiveFetchJob timeout message #3807 added a . This adds a log message when that timeout is reached --- .../trends/databrowser3/archive/ArchiveFetchJob.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/archive/ArchiveFetchJob.java b/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/archive/ArchiveFetchJob.java index b74240cba8..ef7409312a 100644 --- a/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/archive/ArchiveFetchJob.java +++ b/app/databrowser/src/main/java/org/csstudio/trends/databrowser3/archive/ArchiveFetchJob.java @@ -302,10 +302,16 @@ public void run(JobMonitor monitor) throws Exception final String info = MessageFormat.format(Messages.ArchiveFetchProgressFmt, currentMessage, seconds); monitor.updateTaskName(info); - if (monitor.isCanceled() - || (Preferences.archive_read_timeout_ms > 0 - && System.currentTimeMillis() - sourceStartTime > Preferences.archive_read_timeout_ms)) + if (monitor.isCanceled()) worker.cancel(); + else if (Preferences.archive_read_timeout_ms > 0 + && System.currentTimeMillis() - sourceStartTime > Preferences.archive_read_timeout_ms) + { + if (! worker.cancelled) + logger.log(Level.WARNING, + () -> this + " cancelled because of " + Preferences.archive_read_timeout_ms + " ms timeout"); + worker.cancel(); + } } } finally