Changeset 62 for remote_control/puzzlebox_brainstorms_client_thinkgear.py

Timestamp:

06/22/10 14:42:27 (11 years ago)

Author:

sc

Message:

client_thinkgear:

• no longer inherits from puzzlebox_brainstorms_client
• authorization can be enabled/disabled via configuration file
• automatically attempts to reset connection parameters to JSON if response is not recognized

configuration:

• thinkgear authorization enable/disble support

thinkgear_emulator_server_setup.py:

• initial checkin

File:

• remote_control/puzzlebox_brainstorms_client_thinkgear.py (modified) (8 diffs)

remote_control/puzzlebox_brainstorms_client_thinkgear.py

@@ -20 +20 @@
 
 import puzzlebox_brainstorms_configuration as configuration
-import puzzlebox_brainstorms_client as client
 
 #####################################################################
@@ -36 +35 @@
 THINKGEAR_DELIMITER = '\r'
 
+ENABLE_THINKGEAR_AUTHORIZATION = configuration.ENABLE_THINKGEAR_AUTHORIZATION
 AUTHORIZATION_REQUEST = configuration.THINKGEAR_AUTHORIZATION_REQUEST
 
@@ -46 +46 @@
 #####################################################################
 
-class puzzlebox_brainstorms_client_thinkgear(client.puzzlebox_brainstorms_client):
+class puzzlebox_brainstorms_client_thinkgear:
         
         def __init__(self, log, \
@@ -200 +200 @@
                         data = json.loads(line)
                 except Exception, e:
-                        if SELF.DEBUG:
+                        if self.DEBUG:
                                 print "Partial data received (or error:",
                                 print e
@@ -207 +207 @@
                                 print "line:",
                                 print line
+
+                                # We've received back an unrecognized response
+                                # so we'll attempt to reset the server's
+                                # parameters for JSON communication
+                                self.send_data(self.factory.parameters)
                                 
                 else:
@@ -243 +248 @@
 #####################################################################
 
-class puzzlebox_brainstorms_client_thinkgear_factory( \
-        client.puzzlebox_brainstorms_client_send_command_factory):
+class puzzlebox_brainstorms_client_thinkgear_factory(protocol.ClientFactory):
         
         def __init__(self, log, \
@@ -289 +293 @@
 
 
+        ##################################################################
+        
+        def clientConnectionFailed(self, connector, reason):
+                
+                if self.DEBUG:
+                        print "Client failed to connect to remote component at %s:%i" % \
+                           (self.server_host, self.server_port)
+                
+                reply = 'FAILED_TO_CONNECT'
+                
+                self.connection_attempt = self.connection_attempt + 1
+                
+                if ((self.max_connection_attempts == None) or \
+                         (self.connection_attempt <= self.max_connection_attempts)):
+                        
+                        # If connection failed retry after one second
+                        reactor.callLater(1, connector.connect)
+                
+                else:
+                        if self.DEBUG:
+                                print "Maximum connection retries reached, aborting"
+                        
+                        
+                        self.replyDefer.callback(reply)
+        
+        
+        ##################################################################
+        
+        def clientConnectionLost(self, connector, reason):
+                
+                # Losing Connection is expected after data exchange is complete
+                try:
+                        self.replyDefer.callback(reason)
+                except:
+                        pass
+
+
 #####################################################################
 # Main
@@ -307 +348 @@
                     DEBUG=DEBUG)
 
-        # Use ThinkGear authentication
-##      reactor.callWhenRunning( \
-##              thinkgear_client.authorize_and_send_parameters, \
-##              thinkgear_parameters, \
-##              authorization_request)
-        
-        # Do not use ThinkGear authentication
-        authorization_request = None
-        reactor.callWhenRunning( \
-                thinkgear_client.send_parameters, \
-                thinkgear_parameters, \
-                authorization_request)
+
+        if ENABLE_THINKGEAR_AUTHORIZATION:
+                # Use ThinkGear authentication
+                reactor.callWhenRunning( \
+                        thinkgear_client.authorize_and_send_parameters, \
+                        thinkgear_parameters, \
+                        authorization_request)
+
+        else:   
+                # Do not use ThinkGear authentication
+                authorization_request = None
+                reactor.callWhenRunning( \
+                        thinkgear_client.send_parameters, \
+                        thinkgear_parameters, \
+                        authorization_request)