Pass request to the on_open handler as a first parameter.

mrjoes · mrjoes · commit 61fd3e57d73e · 2011-03-20T11:35:07.000+02:00
diff --git a/examples/ping/index.html b/examples/ping/index.html
@@ -29,7 +29,8 @@
                      'Server: ' + getPrintableDate(server) + '<br/>' +
                      'Delta:  ' + (now.getTime() - ping.getTime()).toString() + '<br/>' +
                      'SrDelta:' + (server.getTime() - ping.getTime()).toString() + '<br/>' +
-                     'Message:' + data.text
+                     'Message:' + data.text + '<br/>' +
+                     'Remote IP:' + data.ip
        );
 
       //sendPing();
diff --git a/examples/ping/ping.py b/examples/ping/ping.py
@@ -15,8 +15,12 @@ def get(self):
         self.render("index.html")
 
 class PingConnection(tornadio.SocketConnection):
+    def on_open(self, request, *args, **kwargs):
+        self.ip = request.remote_ip
+
     def on_message(self, message):
         message['server'] = str(datetime.now())
+        message['ip'] = self.ip
         self.send(message)
 
 #use the routes classmethod to build the correct resource
diff --git a/tornadio/persistent.py b/tornadio/persistent.py
@@ -74,7 +74,7 @@ def open(self, *args, **kwargs):
         # message
         self.send('no_session')
 
-        self.connection.on_open(*args, **kwargs)
+        self.connection.on_open(self.request, *args, **kwargs)
 
     def on_message(self, message):
         self.async_callback(self.connection.raw_message)(message)
diff --git a/tornadio/pollingsession.py b/tornadio/pollingsession.py
@@ -43,7 +43,7 @@ def __init__(self, session_id, expiry, router,
         self.send(session_id)
 
         # Notify that channel was opened
-        self.on_open(*args, **kwargs)
+        self.on_open(self.request, *args, **kwargs)
 
     def on_delete(self, forced):
         """Called by the session management class when item is
