Merge pull request #190 from pixxelhq/master

v5.10.9-Pixxel-7.1.0
pixxelhq · Jan 9, 2025 · 4a34270 · 4a34270
2 parents edc5c12 + 0227bdd
commit 4a34270
Show file tree

Hide file tree

Showing 36 changed files with 78 additions and 51 deletions.
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-7.0.0</version>
+    <version>5.10.9-Pixxel-7.1.0</version>
   </parent>
 
   <artifactId>distribution</artifactId>

diff --git a/examples/cascading/pom.xml b/examples/cascading/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.0.0</version>
+    <version>5.10.9-Pixxel-7.1.0</version>
   </parent>
 
   <artifactId>cascading</artifactId>

diff --git a/examples/ccsds-frames/pom.xml b/examples/ccsds-frames/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.0.0</version>
+    <version>5.10.9-Pixxel-7.1.0</version>
   </parent>
 
   <artifactId>ccsds-frames</artifactId>

diff --git a/examples/cfdp-udp/pom.xml b/examples/cfdp-udp/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.0.0</version>
+    <version>5.10.9-Pixxel-7.1.0</version>
   </parent>
 
   <artifactId>cfdp-udp</artifactId>

diff --git a/examples/cfdp/pom.xml b/examples/cfdp/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.0.0</version>
+    <version>5.10.9-Pixxel-7.1.0</version>
   </parent>
 
   <artifactId>cfdp</artifactId>

diff --git a/examples/perftest1/pom.xml b/examples/perftest1/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.0.0</version>
+    <version>5.10.9-Pixxel-7.1.0</version>
   </parent>
 
   <artifactId>perftest1</artifactId>

diff --git a/examples/perftest2/pom.xml b/examples/perftest2/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.0.0</version>
+    <version>5.10.9-Pixxel-7.1.0</version>
   </parent>
 
   <artifactId>perftest2</artifactId>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-7.0.0</version>
+    <version>5.10.9-Pixxel-7.1.0</version>
   </parent>
 
   <groupId>org.yamcs.examples</groupId>

diff --git a/examples/pus/pom.xml b/examples/pus/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.0.0</version>
+    <version>5.10.9-Pixxel-7.1.0</version>
   </parent>
 
   <artifactId>pus</artifactId>

diff --git a/examples/replication1/pom.xml b/examples/replication1/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.0.0</version>
+    <version>5.10.9-Pixxel-7.1.0</version>
   </parent>
 
   <artifactId>replication1</artifactId>

diff --git a/examples/replication2/pom.xml b/examples/replication2/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.0.0</version>
+    <version>5.10.9-Pixxel-7.1.0</version>
   </parent>
 
   <artifactId>replication2</artifactId>

diff --git a/examples/replication3/pom.xml b/examples/replication3/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.0.0</version>
+    <version>5.10.9-Pixxel-7.1.0</version>
   </parent>
 
   <artifactId>replication3</artifactId>

diff --git a/examples/simulation/pom.xml b/examples/simulation/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.0.0</version>
+    <version>5.10.9-Pixxel-7.1.0</version>
   </parent>
 
   <artifactId>simulation</artifactId>

diff --git a/examples/snippets/pom.xml b/examples/snippets/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.0.0</version>
+    <version>5.10.9-Pixxel-7.1.0</version>
   </parent>
 
   <artifactId>snippets</artifactId>

diff --git a/examples/templates/pom.xml b/examples/templates/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>5.10.9-Pixxel-7.0.0</version>
+    <version>5.10.9-Pixxel-7.1.0</version>
   </parent>
 
   <artifactId>templates</artifactId>

diff --git a/packet-viewer/pom.xml b/packet-viewer/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-7.0.0</version>
+    <version>5.10.9-Pixxel-7.1.0</version>
   </parent>
 
   <artifactId>packet-viewer</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.yamcs</groupId>
 	<artifactId>yamcs</artifactId>
-	<version>5.10.9-Pixxel-7.0.0</version>
+	<version>5.10.9-Pixxel-7.1.0</version>
 
 	<packaging>pom</packaging>
 

diff --git a/simulator/pom.xml b/simulator/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-7.0.0</version>
+    <version>5.10.9-Pixxel-7.1.0</version>
   </parent>
 
   <artifactId>simulator</artifactId>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.yamcs</groupId>
 		<artifactId>yamcs</artifactId>
-		<version>5.10.9-Pixxel-7.0.0</version>
+		<version>5.10.9-Pixxel-7.1.0</version>
 	</parent>
 
 	<artifactId>tests</artifactId>

diff --git a/yamcs-api/pom.xml b/yamcs-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-7.0.0</version>
+    <version>5.10.9-Pixxel-7.1.0</version>
   </parent>
 
   <artifactId>yamcs-api</artifactId>

diff --git a/yamcs-client/pom.xml b/yamcs-client/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-7.0.0</version>
+    <version>5.10.9-Pixxel-7.1.0</version>
   </parent>
 
   <artifactId>yamcs-client</artifactId>

diff --git a/yamcs-core/pom.xml b/yamcs-core/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.yamcs</groupId>
     <artifactId>yamcs</artifactId>
-    <version>5.10.9-Pixxel-7.0.0</version>
+    <version>5.10.9-Pixxel-7.1.0</version>
   </parent>
 
   <artifactId>yamcs-core</artifactId>

diff --git a/yamcs-core/src/main/java/org/yamcs/events/AbstractEventProducer.java b/yamcs-core/src/main/java/org/yamcs/events/AbstractEventProducer.java
@@ -130,7 +130,10 @@ public void sendEvent(EventSeverity severity, String type, String msg, long gent
             log.debug("event: {}; {}; {}", severity, type, msg);
         }
 
-        Event.Builder eventb = newEvent().setSeverity(severity).setMessage(msg).setGenerationTime(gentime);
+        Event.Builder eventb = newEvent()
+                            .setSeverity(severity)
+                            .setMessage(msg)
+                            .setGenerationTime(gentime);
         if (type != null) {
             eventb.setType(type);
         }

diff --git a/yamcs-core/src/main/java/org/yamcs/events/EventProducerFactory.java b/yamcs-core/src/main/java/org/yamcs/events/EventProducerFactory.java
@@ -78,4 +78,24 @@ public static EventProducer getEventProducer(String yamcsInstance, String source
 
         return eventProducer;
     }
+
+    /**
+     *
+     * @param yamcsInstance
+     * @param source
+     *            source for the events
+     * @param repeatedEventTimeoutMillisec
+     *            suppress events that repeat in this interval
+     * @param repeatedEventReduction
+     *            supress event generation count
+     * @return an event producer for the given instance, source and with the repeated event reduction turned on.
+     */
+    public static EventProducer getEventProducer(String yamcsInstance, String source,
+            long repeatedEventTimeoutMillisec, boolean repeatedEventReduction) {
+        EventProducer eventProducer = getEventProducer(yamcsInstance);
+        eventProducer.setRepeatedEventReduction(repeatedEventReduction, repeatedEventTimeoutMillisec);
+        eventProducer.setSource(source);
+
+        return eventProducer;
+    }
 }
diff --git a/yamcs-core/src/main/java/org/yamcs/security/SessionManager.java b/yamcs-core/src/main/java/org/yamcs/security/SessionManager.java
@@ -30,7 +30,7 @@ public class SessionManager {
      * 
      * In terms of OAuth this corresponds to the lifetime of a refresh token.
      */
-    private static final long SESSION_IDLE = 30 * 60 * 1000L; // 30 minutes
+    private static final long SESSION_IDLE = 2 * 60 * 60 * 1000L; // 2 hours
 
     private ConcurrentMap<String, UserSession> sessions = new ConcurrentHashMap<>();
     private CopyOnWriteArraySet<SessionListener> sessionListeners = new CopyOnWriteArraySet<>();

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/five/SubServiceFour.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/five/SubServiceFour.java
@@ -24,11 +24,13 @@ public class SubServiceFour implements PusSubService {
     Log log;
 
     EventProducer eventProducer;
-    static String source = "s(5,4) | High Severity Events";
+    static String preSource = "s(5,4) | High Severity Events";
 
     public SubServiceFour(String yamcsInstance, YConfiguration subServiceSixConfig) {
         this.yamcsInstance = yamcsInstance;
         log = new Log(getClass(), yamcsInstance);
+
+        eventProducer = EventProducerFactory.getEventProducer(yamcsInstance, this.getClass().getSimpleName(), 10_000, false);
     }
 
     @Override
@@ -95,8 +97,7 @@ public ArrayList<TmPacket> process(TmPacket tmPacket) {
             }
         }
 
-        eventProducer = EventProducerFactory.getEventProducer(yamcsInstance, this.getClass().getSimpleName(), 120000);
-        eventProducer.setSource(source + " | " + ServiceOne.ccsdsApids.get(apid));
+        eventProducer.setSource(preSource + " | " + ServiceOne.ccsdsApids.get(apid));
 
         eventDec += " is thrown";
         eventProducer.sendEvent(EventSeverity.CRITICAL, ServiceOne.ccsdsApids.get(apid), eventDec, tmPacket.getGenerationTime());

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/five/SubServiceOne.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/five/SubServiceOne.java
@@ -25,11 +25,13 @@ public class SubServiceOne implements PusSubService {
 
     EventProducer eventProducer;
 
-    static String source = "s(5,1) | Informative Events";
+    static String preSource = "s(5,1) | Informative Events";
 
     public SubServiceOne(String yamcsInstance, YConfiguration subServiceSixConfig) {
         this.yamcsInstance = yamcsInstance;
         log = new Log(getClass(), yamcsInstance);
+
+        eventProducer = EventProducerFactory.getEventProducer(yamcsInstance, this.getClass().getSimpleName(), 10_000, false);
     }
 
     @Override
@@ -97,8 +99,7 @@ public ArrayList<TmPacket> process(TmPacket tmPacket) {
             }
         }
 
-        eventProducer = EventProducerFactory.getEventProducer(yamcsInstance, this.getClass().getSimpleName(), 120000);
-        eventProducer.setSource(source + " | " + ServiceOne.ccsdsApids.get(apid));
+        eventProducer.setSource(preSource + " | " + ServiceOne.ccsdsApids.get(apid));
 
         eventDec += " is thrown";
         eventProducer.sendEvent(EventSeverity.WATCH, ServiceOne.ccsdsApids.get(apid), eventDec, tmPacket.getGenerationTime());

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/five/SubServiceThree.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/five/SubServiceThree.java
@@ -24,11 +24,13 @@ public class SubServiceThree implements PusSubService {
     Log log;
 
     EventProducer eventProducer;
-    static String source = "s(5,3) | Medium Severity Events";
+    static String preSource = "s(5,3) | Medium Severity Events";
 
     public SubServiceThree(String yamcsInstance, YConfiguration subServiceSixConfig) {
         this.yamcsInstance = yamcsInstance;
         log = new Log(getClass(), yamcsInstance);
+
+        eventProducer = EventProducerFactory.getEventProducer(yamcsInstance, this.getClass().getSimpleName(), 10_000, false);
     }
 
     @Override
@@ -96,8 +98,7 @@ public ArrayList<TmPacket> process(TmPacket tmPacket) {
             }
         }
 
-        eventProducer = EventProducerFactory.getEventProducer(yamcsInstance, this.getClass().getSimpleName(), 120000);
-        eventProducer.setSource(source + " | " + ServiceOne.ccsdsApids.get(apid));
+        eventProducer.setSource(preSource + " | " + ServiceOne.ccsdsApids.get(apid));
 
         eventDec += " is thrown";
         eventProducer.sendEvent(EventSeverity.DISTRESS, ServiceOne.ccsdsApids.get(apid), eventDec, tmPacket.getGenerationTime());

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/five/SubServiceTwo.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/five/SubServiceTwo.java
@@ -24,11 +24,13 @@ public class SubServiceTwo implements PusSubService {
     Log log;
 
     EventProducer eventProducer;
-    static String source = "s(5,2) | Low Severity Events";
+    static String preSource = "s(5,2) | Low Severity Events";
 
     public SubServiceTwo(String yamcsInstance, YConfiguration subServiceSixConfig) {
         this.yamcsInstance = yamcsInstance;
         log = new Log(getClass(), yamcsInstance);
+
+        eventProducer = EventProducerFactory.getEventProducer(yamcsInstance, this.getClass().getSimpleName(), 10_000, false);
     }
 
     @Override
@@ -95,8 +97,7 @@ public ArrayList<TmPacket> process(TmPacket tmPacket) {
             }
         }
 
-        eventProducer = EventProducerFactory.getEventProducer(yamcsInstance, this.getClass().getSimpleName(), 120000);
-        eventProducer.setSource(source + " | " + ServiceOne.ccsdsApids.get(apid));
+        eventProducer.setSource(preSource + " | " + ServiceOne.ccsdsApids.get(apid));
 
         eventDec += " is thrown";
         eventProducer.sendEvent(EventSeverity.WARNING, ServiceOne.ccsdsApids.get(apid), eventDec, tmPacket.getGenerationTime());

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/one/SubServiceEight.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/one/SubServiceEight.java
@@ -16,14 +16,14 @@
 
 public class SubServiceEight implements PusSubService {
     EventProducer eventProducer;
+    String yamcsInstance;
 
     static final String source = "Service: 1 | SubService: 8 | Failure";
     static final String TC_COMPLETION_EXECUTION_FAILED = "TC_COMPLETION_EXECUTION_FAILED";
 
     public SubServiceEight(String yamcsInstance) {        
-        // FIXME: Confirm the repeatedEventTimeoutMillisec value, which most likely depends on the datarate of TM
-        eventProducer = EventProducerFactory.getEventProducer(yamcsInstance, this.getClass().getSimpleName(), 10);
-        eventProducer.setSource(source);
+        this.yamcsInstance = yamcsInstance;
+        eventProducer = EventProducerFactory.getEventProducer(yamcsInstance, source, 10_000, false);
     }
 
     @Override

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/one/SubServiceOne.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/one/SubServiceOne.java
@@ -14,14 +14,14 @@
 
 public class SubServiceOne implements PusSubService {
     EventProducer eventProducer;
+    String yamcsInstance;
 
     static final String source = "Service: 1 | SubService: 1 | ACCEPTED";
     static final String TC_ACCEPTANCE_SUCCESS = "TC_ACCEPTANCE_SUCCESS";
 
     public SubServiceOne(String yamcsInstance) {
-        // FIXME: Confirm the repeatedEventTimeoutMillisec value, which most likely depends on the datarate of TM
-        eventProducer = EventProducerFactory.getEventProducer(yamcsInstance, this.getClass().getSimpleName(), 10);
-        eventProducer.setSource(source);
+        this.yamcsInstance = yamcsInstance;
+        eventProducer = EventProducerFactory.getEventProducer(yamcsInstance, source, 10_000, false);
     }
 
     @Override

diff --git a/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/one/SubServiceSeven.java b/yamcs-core/src/main/java/org/yamcs/tctm/pus/services/tm/one/SubServiceSeven.java
@@ -14,14 +14,14 @@
 
 public class SubServiceSeven implements PusSubService {
     EventProducer eventProducer;
+    String yamcsInstance;
 
     static final String source = "Service: 1 | SubService: 7 | Completion";
     static final String TC_COMPLETION_EXECUTION_SUCCESS = "TC_COMPLETION_EXECUTION_SUCCESS";
 
     public SubServiceSeven(String yamcsInstance) {
-        // FIXME: Confirm the repeatedEventTimeoutMillisec value, which most likely depends on the datarate of TM
-        eventProducer = EventProducerFactory.getEventProducer(yamcsInstance, this.getClass().getSimpleName(), 10);
-        eventProducer.setSource(source);
+        this.yamcsInstance = yamcsInstance;
+        eventProducer = EventProducerFactory.getEventProducer(yamcsInstance, source, 10_000, false);
     }
 
     @Override