Author: dmeyer
Date: Thu Feb 14 07:46:37 2008
New Revision: 3100
Log:
adjust to latest kaa.notifier changes
Modified:
trunk/beacon/src/client.py
trunk/beacon/src/query.py
trunk/beacon/src/server/db.py
trunk/display/src/lcdproc.py
Modified: trunk/beacon/src/client.py
==============================================================================
--- trunk/beacon/src/client.py (original)
+++ trunk/beacon/src/client.py Thu Feb 14 07:46:37 2008
@@ -170,7 +170,7 @@
kaa.db.Database.get_db_info() for more details.
"""
if self.status != CONNECTED:
- yield kaa.YieldCallback(self.signals['connect'])
+ yield kaa.InProgressCallback(self.signals['connect'])
yield self._db.get_db_info()
Modified: trunk/beacon/src/query.py
==============================================================================
--- trunk/beacon/src/query.py (original)
+++ trunk/beacon/src/query.py Thu Feb 14 07:46:37 2008
@@ -192,7 +192,7 @@
"""
if not self._client.is_connected():
# wait until the client is connected
- yield kaa.YieldCallback(self._client.signals['connect'])
+ yield kaa.InProgressCallback(self._client.signals['connect'])
if 'parent' in query and isinstance(query['parent'], Item) and \
not query['parent']._beacon_id:
Modified: trunk/beacon/src/server/db.py
==============================================================================
--- trunk/beacon/src/server/db.py (original)
+++ trunk/beacon/src/server/db.py Thu Feb 14 07:46:37 2008
@@ -99,7 +99,7 @@
Return InProgress object to wait until the db is
not used by any reader.
"""
- return kaa.YieldCallback(self.signals['unlock'])
+ return kaa.InProgressCallback(self.signals['unlock'])
Modified: trunk/display/src/lcdproc.py
==============================================================================
--- trunk/display/src/lcdproc.py (original)
+++ trunk/display/src/lcdproc.py Thu Feb 14 07:46:37 2008
@@ -224,22 +224,15 @@
Connect to the server and init the connection.
"""
self.socket = kaa.Socket()
- wait = kaa.YieldCallback()
- self.socket.signals['connected'].connect_once(wait)
- self.socket.connect((server, port), async=True)
- yield wait
-
- result = wait.get_result()
- if isinstance(result, (Exception, socket.error)):
+ try:
+ yield self.socket.connect((server, port))
+ except Exception, e:
# try again later
log.error('LCDproc: %s. Will try again later', result)
kaa.OneShotTimer(self._connect, server, port).start(10)
yield False
- wait = kaa.YieldCallback()
- self.socket.signals['read'].connect_once(wait)
- self._send("hello")
+ wait = kaa.InProgressCallback(self.socket.signals['read'])
yield wait
-
line = wait.get_result().strip().split()
self._send('client_set name kaa')
self.size = int(line[7]), int(line[9])
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
