[Zmx-cvs-commit] zmx/InstantXML IXML_Client.py,1.6,1.7 InstantXMLServer.py,1.6,1.7

[Steve S. <ssp...@us...>]

Update of /cvsroot/zmx/zmx/InstantXML
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8185/InstantXML

Modified Files:
	IXML_Client.py InstantXMLServer.py 
Log Message:
added networkAvailableStatus messages.

Index: InstantXMLServer.py
===================================================================
RCS file: /cvsroot/zmx/zmx/InstantXML/InstantXMLServer.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** InstantXMLServer.py	10 Feb 2005 14:22:53 -0000	1.6
--- InstantXMLServer.py	20 Mar 2005 02:04:38 -0000	1.7
***************
*** 22,26 ****
  VERSION = string.split(RCS_ID,' ')[2]
  
! PING_SLEEPTIME = 10   # seconds
  
  import socket
--- 22,26 ----
  VERSION = string.split(RCS_ID,' ')[2]
  
! PING_SLEEPTIME = 60  # maximum ping delay seconds
  
  import socket
***************
*** 28,32 ****
  import asynchat
  
! from xmlrpclib import loads, dumps
  
  from threading import RLock, Thread
--- 28,32 ----
  import asynchat
  
! from xmlrpclib import loads, dumps, Boolean
  
  from threading import RLock, Thread
***************
*** 44,48 ****
          self.client = client
          
-         
      def pause(self):
          """
--- 44,47 ----
***************
*** 56,62 ****
          """
          self.running = 1
          while 1:
              if self.running:
!                 sleep(PING_SLEEPTIME)
                  self.client.do_ping()
              else:
--- 55,62 ----
          """
          self.running = 1
+         
          while 1:
              if self.running:
!                 sleep(self.client.ping_delay)  # the client may adjust the ping_delay depending on the configuration of the channels that need pings.
                  self.client.do_ping()
              else:
***************
*** 106,112 ****
                      self.sender_id = values.get('sender_id','')
                      self.needs_ping = values.get('send_ping',0)
                      if self.needs_ping:
!                         self.server.setup_ping_thread(self)
!                     
                      if not self.sender_id:
                          self.sender_id = None
--- 106,113 ----
                      self.sender_id = values.get('sender_id','')
                      self.needs_ping = values.get('send_ping',0)
+ 
                      if self.needs_ping:
!                         self.server.setup_ping_thread(self) # only set up pings if requested.
!                         
                      if not self.sender_id:
                          self.sender_id = None
***************
*** 188,191 ****
--- 189,193 ----
      
      channel_class = chat_channel
+     ping_delay = PING_SLEEPTIME
      
      spy = 0
***************
*** 244,247 ****
--- 246,253 ----
          establish the ping thread.
          """
+         if type(client.needs_ping) in [type(1.0), type(1)]:
+             if self.ping_delay > client.needs_ping:
+                 self.ping_delay = client.needs_ping  # use client with minimum delay to set delay time
+                                 
          if not self.ping_thread:
              self.ping_thread = PingThread(self)
***************
*** 262,265 ****
--- 268,272 ----
              self.ping_thread.pause()
              self.ping_thread = None
+             self.ping_delay = PING_SLEEPTIME
  
      def writable (self):

Index: IXML_Client.py
===================================================================
RCS file: /cvsroot/zmx/zmx/InstantXML/IXML_Client.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** IXML_Client.py	14 Feb 2005 09:55:56 -0000	1.6
--- IXML_Client.py	20 Mar 2005 02:04:38 -0000	1.7
***************
*** 80,85 ****
          #print 'Finishing loop'
  
! #CONNECT_STRUCT = {'sender_id': 'c1: IXML_Client', 'ssecret':'foo', 'send_ping':1}
! CONNECT_STRUCT = {'sender_id': 'c1: IXML_Client', 'ssecret':'foo'}
  
  class IXML_Client:
--- 80,85 ----
          #print 'Finishing loop'
  
! CONNECT_STRUCT = {'sender_id': 'c1: IXML_Client', 'ssecret':'foo', 'send_ping':5.0}
! #CONNECT_STRUCT = {'sender_id': 'c1: IXML_Client', 'ssecret':'foo'}
  
  class IXML_Client: