From afc587212eb908420b8fb186cecc324753a5bbb1 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Sun, 18 Jun 2006 02:06:40 +0000
Subject: Get page sharing back to work

---
(limited to 'sugar/p2p')

diff --git a/sugar/p2p/NotificationListener.py b/sugar/p2p/NotificationListener.py
index 433b777..b3c03c8 100644
--- a/sugar/p2p/NotificationListener.py
+++ b/sugar/p2p/NotificationListener.py
@@ -1,8 +1,11 @@
+import logging
+
 from sugar.p2p.Notifier import Notifier
-import network
+from sugar.p2p import network
 
 class NotificationListener:
 	def __init__(self, service):
+		logging.debug('Start notification listener. Service %s, address %s, port %s' % (service.get_type(), service.get_address(), service.get_port()))
 		server = network.GroupServer(service.get_address(),
 									 service.get_port(),
 									 self._recv_multicast)
diff --git a/sugar/p2p/model/LocalModel.py b/sugar/p2p/model/LocalModel.py
index 9d7046d..18a7529 100644
--- a/sugar/p2p/model/LocalModel.py
+++ b/sugar/p2p/model/LocalModel.py
@@ -1,4 +1,5 @@
 import socket
+import logging
 
 from sugar.presence.Service import Service
 from sugar.p2p.Notifier import Notifier
@@ -50,6 +51,7 @@ class LocalModel(AbstractModel):
 		port = service.get_port()
 		while not started and tries > 0:
 			try:
+				logging.debug('Start model server on port %d' % (port))
 				p2p_server = network.GlibXMLRPCServer(("", port))
 				p2p_server.register_instance(ModelRequestHandler(self))
 				started = True
diff --git a/sugar/p2p/model/RemoteModel.py b/sugar/p2p/model/RemoteModel.py
index d11157a..00b3cb6 100644
--- a/sugar/p2p/model/RemoteModel.py
+++ b/sugar/p2p/model/RemoteModel.py
@@ -1,4 +1,5 @@
 import xmlrpclib
+import logging
 
 from sugar.p2p.NotificationListener import NotificationListener
 from sugar.p2p.model.AbstractModel import AbstractModel
@@ -11,6 +12,7 @@ class RemoteModel(AbstractModel):
 		self._notification_service = notification_service
 		
 		addr = "http://%s:%d" % (service.get_address(), service.get_port())
+		logging.debug('Setup remote model ' + addr)
 		self._client = xmlrpclib.ServerProxy(addr)
 		
 		self._setup_notification_listener()
--
cgit v0.9.1