Changeset 324:b1d504a874dc for src

Timestamp:

10/21/12 05:08:13 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Forced logging now logs with the current timestamp even for delayed change loggers (#133)

File:

• src/mlx/checks.py (modified) (7 diffs)

src/mlx/checks.py

@@ -275 +275 @@
         self._logInitial = logInitial    
 
-    def _getLogTimestamp(self, state):
+    def _getLogTimestamp(self, state, forced):
         """Get the log timestamp."""
         return state.timestamp
@@ -294 +294 @@
         message = self._getMessage(flight, state, forced)
         if message is not None:
-            logger.message(self._getLogTimestamp(state), message)
+            logger.message(self._getLogTimestamp(state, forced), message)
         
 #-------------------------------------------------------------------------------
@@ -351 +351 @@
 
         if self._firstChange is not None:
-            if state.timestamp >= min(self._lastChangeState.timestamp + self._minDelay,
+            if state.timestamp >= min(self._lastChangeState.timestamp +
+                                      self._minDelay,
                                       self._firstChange + self._maxDelay):
                 self._firstChange = None
@@ -358 +359 @@
         return False
 
-    def _getLogTimestamp(self, state):
+    def _getLogTimestamp(self, state, forced):
         """Get the log timestamp."""
-        return self._lastChangeState.timestamp if \
-               self._lastChangeState is not None else state.timestamp
+        return self._lastChangeState.timestamp \
+               if not forced and self._lastChangeState is not None \
+               else state.timestamp
 
     def _isDifferent(self, oldValue, newValue):
@@ -398 +400 @@
         DelayedChangeMixin.__init__(self, minDelay = minDelay, maxDelay = maxDelay)
         TemplateMessageMixin.__init__(self, template)
-        self._getLogTimestamp = lambda state: \
-                                DelayedChangeMixin._getLogTimestamp(self, state)
+        self._getLogTimestamp = \
+           lambda state, forced: \
+           DelayedChangeMixin._getLogTimestamp(self, state, forced)
 
 #---------------------------------------------------------------------------------------
@@ -449 +452 @@
         SingleValueMixin.__init__(self, "altimeter")
         DelayedChangeMixin.__init__(self)
-        self._getLogTimestamp = lambda state: \
-                                DelayedChangeMixin._getLogTimestamp(self, state)
+        self._getLogTimestamp = \
+            lambda state, forced: \
+            DelayedChangeMixin._getLogTimestamp(self, state, forced)
 
     def _getMessage(self, flight, state, forced):
@@ -482 +486 @@
                                           forced = forced)
         self._getLogTimestamp = \
-            lambda state: DelayedChangeMixin._getLogTimestamp(self, state)
+            lambda state, forced: \
+            DelayedChangeMixin._getLogTimestamp(self, state, forced)
         self._changed = lambda oldState, state: \
             ForceableLoggerMixin._changed(self, oldState, state)