Ticket #133: event.dif

Index: event.py
===================================================================
--- event.py    (revision 872)
+++ event.py    (working copy)
@@ -17,24 +17,55 @@
 
 import louie
 
-global hostname, web_server_port
-hostname = None
-web_server_port = None
+global myurl
+myurl = ""
 
+# these are services that are currently subscribed to events.
+global subscribed_services
+subscribed_services = {}
 
+def add_subscribed_service( service, subscribeid ):
+    global subscribed_services
+    log.info( Event.__module__, "add_subscribed_service %s (%s)", subscribeid, service )
+    if subscribeid:
+       subscribed_services[subscribeid] = service
+    elif subscribed_services.has_key(subscribeid):
+       del subscribed_services[subscribeid]
+
+def clear_subscribed_service( subscribeid ):
+    log.info( Event.__module__, "clear_subscribed_service %s", subscribeid )
+    global subscribed_services
+    if subscribed_services.has_key(subscribeid):
+       del subscribed_services[subscribeid]
+
+def get_service_by_subscribeid( subscribeid ):
+    log.info(Event.__module__, "get_service_by_subscribeid %s", subscribeid )
+    if subscribed_services.has_key(subscribeid):
+       return subscribed_services[subscribeid]
+    return None
+
+def propagate(event):
+    target_service = get_service_by_subscribeid(event.get_sid())
+    if target_service:
+           target_service.process_event(event)
+
 class EventServer(resource.Resource, log.Loggable):
     logCategory = 'event_server'
 
-    def __init__(self, control_point):
-        self.coherence = control_point.coherence
-        self.control_point = control_point
-        self.coherence.add_web_resource('events',
-                                        self)
-        global hostname, web_server_port
-        hostname = self.coherence.hostname
-        web_server_port = self.coherence.web_server_port
-        self.info("EventServer ready...")
+#    def __init__(self, control_point):
+#        self.control_point = control_point
+    def __init__(self, webserver):
+
+        global myurl
 
+# If using global coherence object
+#        myurl = 'http://%s:%d/events' % (control_point.coherence.hostname, control_point.coherence.web_server_port)
+#        control_point.coherence.add_web_resource('events', self)
+
+# if webserver separated from coherence
+        myurl = webserver.add_web_resource('events', self)
+        self.info("EventServer ready. %s", myurl)
+
     def render_NOTIFY(self, request):
         self.info("EventServer received notify from %s, code: %d" % (request.client, request.code))
         data = request.content.getvalue()
@@ -45,9 +76,9 @@
         louie.send('UPnP.Event.Server.message_received', None, command, headers, data)
 
         if request.code != 200:
-            self.info("data:", data)
+            self.info("data: %s", data)
         else:
-            self.debug("data:", data)
+            self.debug("data: %s", data)
             headers = request.getAllHeaders()
             sid = headers['sid']
             try:
@@ -64,7 +95,7 @@
                     tag = var.tag
                     idx = tag.find('}') + 1
                     event.update({tag[idx:]: var.text})
-            self.control_point.propagate(event)
+            propagate(event)
         return ""
 
 
@@ -117,7 +148,7 @@
         louie.send('UPnP.Event.Client.message_received', None, command, headers, data)
 
         if request.code != 200:
-            self.debug("data:", data)
+            self.info("data: %s", data)
         else:
             headers = request.getAllHeaders()
             try:
@@ -161,7 +192,7 @@
         louie.send('UPnP.Event.Client.message_received', None, command, headers, data)
 
         if request.code != 200:
-            self.debug("data:", data)
+            self.info("data: %s", data)
         else:
             headers = request.getAllHeaders()
             try:
@@ -191,7 +222,8 @@
         self.action = action
 
     def connectionMade(self):
-        self.timeout_checker = reactor.callLater(30, lambda : self.transport.loseConnection())
+        #self.timeout_checker = reactor.callLater(30, lambda : self.transport.loseConnection())
+       pass
 
     def dataReceived(self, data):
         self.info("response received from the Service Events HTTP server ")
@@ -199,10 +231,17 @@
         cmd, headers = utils.parse_http_response(data)
         self.debug("%r %r", cmd, headers)
         if int(cmd[1]) != 200:
-            self.warning("response with error code %r received upon our %r request", cmd[1], self.action)
+            self.warning("response with error code %r received upon our %r request", cmd[1], self.action)
+           clear_subscribed_service(self.service.get_sid())
+            self.service.set_sid(None)
         else:
-            try:
-                self.service.set_sid(headers['sid'])
+            try:
+                self.service.set_sid(headers.get('sid',None))  # this may be an unsubscribe request
+
+               add_subscribed_service(self.service, self.service.get_sid())
+
+               self.debug("add subscription for %s", self.id)
+
                 timeout = headers['timeout']
                 self.debug("%r %r", headers['sid'], headers['timeout'])
                 if timeout == 'infinite':
@@ -218,7 +257,10 @@
 
     def connectionLost( self, reason):
         try:
-            self.timeout_checker.cancel()
+            self.timeout_checker.cancel()
+           # If connection goes need to restart, maybe.
+#          self.service.set_sid( None )
+           self.service.event_connection = None
         except:
             pass
         self.debug( "connection closed %r from the Service Events HTTP server", reason)
@@ -232,7 +274,7 @@
     send a subscribe/renewal/unsubscribe request to a service
     return the device response
     """
-    log_category = "event_protocol"
+    log_category = Event.__module__
     log.info(log_category, "event.subscribe, action: %r", action)
 
     _,host_port,path,_,_ = urlsplit(service.get_base_url())
@@ -260,12 +302,7 @@
         if service.get_sid():
             request.append("SID: %s" % service.get_sid())
         else:
-            # XXX use address and port set in the coherence instance
-            #ip_address = p.transport.getHost().host
-            global hostname, web_server_port
-            #print hostname, web_server_port
-            url = 'http://%s:%d/events' % (hostname, web_server_port)
-            request.append("CALLBACK: <%s>" % url)
+            request.append("CALLBACK: <%s>" % myurl)
             request.append("NT: upnp:event")
 
         request.append('Date: %s' % time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime()))
@@ -277,6 +314,7 @@
         try:
             p.transport.writeSomeData(request)
         except AttributeError:
+            service.event_connection = None # need new connection
             log.info(log_category, "transport for event %r already gone", action)
        # print "event.subscribe.send_request", d
         #return d