From 5f96a5959e8070b178b7dbed2c60edda662701b3 Mon Sep 17 00:00:00 2001 From: Gonzalo Date: Wed, 24 Nov 2021 13:34:14 -0300 Subject: [PATCH 1/3] Use $ for explicit log name --- common/src/main/java/com/genexus/diagnostics/UserLog.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/genexus/diagnostics/UserLog.java b/common/src/main/java/com/genexus/diagnostics/UserLog.java index 3b1a3e39d..210041433 100644 --- a/common/src/main/java/com/genexus/diagnostics/UserLog.java +++ b/common/src/main/java/com/genexus/diagnostics/UserLog.java @@ -19,7 +19,8 @@ public static ILogger getMainLogger() { private static ILogger getLogger(String topic) { ILogger log; if (topic != null && topic.length() > 0) { - log = LogManager.getLogger(String.format("%s.%s", defaultUserLogNamespace, topic.trim())); + String loggerName = topic.startsWith("$") ? topic.substring(1): String.format("%s.%s", defaultUserLogNamespace, topic.trim()); + log = LogManager.getLogger(loggerName); } else { log = getMainLogger(); From 129304ec514370b67ccced3ae05579010ebc47b2 Mon Sep 17 00:00:00 2001 From: Gonzalo Date: Fri, 26 Nov 2021 16:17:59 -0300 Subject: [PATCH 2/3] Always send progress to Client. Do not check if it running. --- .../genexus/internet/GXWebProgressIndicator.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/java/src/main/java/com/genexus/internet/GXWebProgressIndicator.java b/java/src/main/java/com/genexus/internet/GXWebProgressIndicator.java index 9c4821bb7..9396c56cd 100644 --- a/java/src/main/java/com/genexus/internet/GXWebProgressIndicator.java +++ b/java/src/main/java/com/genexus/internet/GXWebProgressIndicator.java @@ -27,14 +27,11 @@ public void show() private void updateProgress() { - if (running) - { - GXWebNotificationInfo notif = new GXWebNotificationInfo(0,context,""); - notif.setId(GXWebProgressIndicator.ID); - notif.setGroupName(GXWebProgressIndicator.ID); - notif.setMessage(info); - notification.notify(notif); - } + GXWebNotificationInfo notif = new GXWebNotificationInfo(0,context,""); + notif.setId(GXWebProgressIndicator.ID); + notif.setGroupName(GXWebProgressIndicator.ID); + notif.setMessage(info); + notification.notify(notif); } public void showWithTitle(String title) From d79c7eb59c830a425c15b8d715752538f95fe269 Mon Sep 17 00:00:00 2001 From: Gonzalo Date: Mon, 29 Nov 2021 15:38:10 -0300 Subject: [PATCH 3/3] Remove running var --- .../java/com/genexus/internet/GXWebProgressIndicator.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/java/src/main/java/com/genexus/internet/GXWebProgressIndicator.java b/java/src/main/java/com/genexus/internet/GXWebProgressIndicator.java index 9396c56cd..46aebaffc 100644 --- a/java/src/main/java/com/genexus/internet/GXWebProgressIndicator.java +++ b/java/src/main/java/com/genexus/internet/GXWebProgressIndicator.java @@ -8,8 +8,6 @@ public class GXWebProgressIndicator private GXWebNotification notification; private GXWebProgressIndicatorInfo info; private ModelContext context; - private boolean running = false; - public GXWebProgressIndicator(ModelContext gxContext) { @@ -20,7 +18,6 @@ public GXWebProgressIndicator(ModelContext gxContext) public void show() { - running = true; setAction("0"); updateProgress(); } @@ -36,7 +33,6 @@ private void updateProgress() public void showWithTitle(String title) { - running = true; setTitle(title); setAction("1"); updateProgress(); @@ -44,7 +40,6 @@ public void showWithTitle(String title) public void showWithTitleAndDescription(String title, String desc) { - running = true; setTitle(title); setDescription(desc); setAction("2"); @@ -55,7 +50,6 @@ public void hide() { setAction("3"); updateProgress(); - running = false; } private String getAction() {