Merge pull request #2892 from ControlSystemStudio/alarm_patches

Handle alarm actions to show error message
ControlSystemStudio · Dec 16, 2023 · 2fac707 · 2fac707
2 parents 79e51d2 + 4b4539d
commit 2fac707
Show file tree

Hide file tree

Showing 13 changed files with 408 additions and 370 deletions.
diff --git a/app/alarm/datasource/src/main/java/org/phoebus/pv/alarm/AlarmContext.java b/app/alarm/datasource/src/main/java/org/phoebus/pv/alarm/AlarmContext.java
@@ -116,11 +116,14 @@ public static synchronized void acknowledgePV(AlarmPV alarmPV, boolean ack)
                     }
                     if (node != null)
                     {
-                        try {
-                            alarmModels.get(alarmPV.getInfo().getRoot()).acknowledge(node, ack);
-                        } catch (Exception e) {
-                            logger.log(Level.WARNING, "Failed to acknowledge alarm", e);
-                        }
+                        AlarmTreeItem<?> alarmClientNode = node;
+                        JobManager.schedule("Acknowledge/unacknowledge alarm", monitor -> {
+                            try {
+                                alarmModels.get(alarmPV.getInfo().getRoot()).acknowledge(alarmClientNode, ack);
+                            } catch (Exception e) {
+                                logger.log(Level.WARNING, "Failed to acknowledge alarm", e);
+                            }
+                        });
                     }
                 }
             }
@@ -153,8 +156,14 @@ public static synchronized void enablePV(AlarmPV alarmPV, boolean enable)
                             for (AlarmClientLeaf pv : pvs)
                             {
                                 final AlarmClientLeaf copy = pv.createDetachedCopy();
-                                if (copy.setEnabled(enable))
-                                    alarmModels.get(alarmPV.getInfo().getRoot()).sendItemConfigurationUpdate(pv.getPathName(), copy);
+                                if (copy.setEnabled(enable)){
+                                    try {
+                                        alarmModels.get(alarmPV.getInfo().getRoot()).sendItemConfigurationUpdate(pv.getPathName(), copy);
+                                    } catch (Exception e) {
+                                        logger.log(Level.WARNING, "Failed to send item configuration update to " + alarmPV.getInfo().getRoot(), e);
+                                        throw e;
+                                    }
+                                }
                             }
                         });
                     }

diff --git a/app/alarm/model/src/main/java/org/phoebus/applications/alarm/AlarmSystem.java b/app/alarm/model/src/main/java/org/phoebus/applications/alarm/AlarmSystem.java
@@ -118,6 +118,8 @@ public class AlarmSystem extends AlarmSystemConstants
     /** "Disable until.." shortcuts */
     @Preference public static String[] shelving_options;
 
+    @Preference public static int max_block_ms;
+
     /** Macros used in UI display/command/web links */
     public static MacroValueProvider macros;