Changeset 349:41c486c8a0b4 for src/mlx/logger.py

Timestamp:

12/10/12 19:28:32 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The basic strobe-less RTO handling logic works (#143)

File:

• src/mlx/logger.py (modified) (6 diffs)

src/mlx/logger.py

@@ -97 +97 @@
 
         def copy(self, timestamp = None, clearTimestamp = False, text = None,
-                 faultScore = None):
+                 faultID = None, faultScore = None, clearFault = False):
             """Create a copy of this entry with the given values changed."""
-            assert faultScore is None or self._faultID is not None
-
             return Logger.Entry(None if clearTimestamp
                                 else self._timestamp if timestamp is None
@@ -109 +107 @@
                                 showTimestamp = self._showTimestamp,
 
-                                faultID = self._faultID,
+                                faultID =
+                                None if clearFault
+                                else self._faultID if faultID is None
+                                else faultID,
 
                                 faultScore =
-                                self._faultScore if faultScore is None
+                                None if clearFault
+                                else self._faultScore if faultScore is None
                                 else faultScore,
 
@@ -248 +250 @@
 
     def fault(self, faultID, timestamp, what, score,
-              updatePrevious = False):
+              updatePrevious = False, updateID = None):
         """Report a fault.
 
@@ -262 +264 @@
         and the new score is not greater than the latest one, the ID of the
         latest one is returned.
+
+        If updateID is given, the log entry with the given ID will be
+        'upgraded' to be a fault with the given data.
 
         Returns an ID of the fault, or -1 if it was not logged."""
@@ -279 +284 @@
                                         faultScore = score)
             self._updateEntry(id, newEntry)
+        elif updateID is not None:
+            id = updateID
+            newEntry = self._entries[id].copy(timestamp = timestamp,
+                                              text = text, faultID = faultID,
+                                              faultScore = score)
+            self._updateEntry(id, newEntry)
         else:
             id = self._addEntry(Logger.Entry(timestamp, text, faultID = faultID,
                                              faultScore = score))
 
-        (messageType, duration) = (const.MESSAGETYPE_NOGO, 10) \
-                                  if score==Logger.NO_GO_SCORE \
-                                  else (const.MESSAGETYPE_FAULT, 5)
-        sendMessage(messageType, text, duration)
+        if updateID is None:
+            (messageType, duration) = (const.MESSAGETYPE_NOGO, 10) \
+                                      if score==Logger.NO_GO_SCORE \
+                                      else (const.MESSAGETYPE_FAULT, 5)
+            sendMessage(messageType, text, duration)
 
         return id
@@ -311 +323 @@
         self._updateEntry(id, self._entries[id].copy(text = line))
 
+    def clearFault(self, id, text):
+        """Update the line with the given ID to contain the given string,
+        and clear its fault state."""
+        newEntry = self._entries[id].copy(text = text, clearFault = True)
+        self._updateEntry(id, newEntry)
+
     def _addEntry(self, entry):
         """Add the given entry to the log.