Changeset 152:f0701a18628a for src/mlx/fs.py

Timestamp:

05/05/12 11:40:28 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Made the sending of the closing message more reliable

File:

• src/mlx/fs.py (modified) (5 diffs)

src/mlx/fs.py

@@ -64 +64 @@
         self.daemon = True
 
-    def add(self, messageType, text, duration):
+    def add(self, messageType, text, duration, disconnect):
         """Add the given message to the requested messages."""
         with self._requestCondition:
-            self._messages.append((messageType, text, duration))
+            self._messages.append((messageType, text, duration,
+                                   disconnect))
             self._requestCondition.notify()
 
@@ -80 +81 @@
         """Perform the thread's operation."""
         while True:
-            (messageType, text, duration) = (None, None, None)
+            (messageType, text, duration, disconnect) = (None, None, None, None)
             with self._requestCondition:
                 now = time.time()
@@ -96 +97 @@
 
                     if self._messages:
-                        (messageType, text, duration) = self._messages[0]
+                        (messageType, text,
+                         duration, disconnect) = self._messages[0]
                         del self._messages[0]
 
             if text is not None:        
-                self._sendMessage(messageType, text, duration)
-
-    def _sendMessage(self, messageType, text, duration):
+                self._sendMessage(messageType, text, duration, disconnect)
+
+    def _sendMessage(self, messageType, text, duration, disconnect):
         """Send the message and setup the next message time."""
         messageLevel = self._config.getMessageTypeLevel(messageType)
@@ -110 +112 @@
         if (messageLevel==const.MESSAGELEVEL_FS or \
             messageLevel==const.MESSAGELEVEL_BOTH):
-            self._simulator.sendMessage("[MLX] " + text, duration = duration)
+            if disconnect:
+                self._simulator.disconnect("[MLX] " + text,
+                                           duration = duration)
+            else:
+                self._simulator.sendMessage("[MLX] " + text,
+                                            duration = duration)
+        elif disconnecte:
+            self._simulator.disconnect()
         self._nextMessageTime = time.time() + duration
 
@@ -129 +138 @@
 #-------------------------------------------------------------------------------
 
-def sendMessage(messageType, text, duration = 3):
+def sendMessage(messageType, text, duration = 3, disconnect = False):
     """Send the given message of the given type into the simulator and/or play
     a corresponding sound."""
     global _messageThread
     if _messageThread is not None:
-        _messageThread.add(messageType, text, duration)
+        _messageThread.add(messageType, text, duration, disconnect)
 
 #-------------------------------------------------------------------------------