The server gets killed now when the activity exits, but an occasional race condition persists where the server fails to start before the first page is requested.

1 files changed, 16 insertions, 5 deletions

diff --git a/activity.py b/activity.py
index 3cf7db0..a3932a6 100644
--- a/activity.py
+++ b/activity.py
@@ -1,11 +1,12 @@
 import os
 import sys
+import signal
+import atexit
 
-# Import the WebActivity class from the Web activity directory.
 from sugar.activity import registry
 activity_info = registry.get_registry().get_activity('org.laptop.WebActivity')
-sys.path.append(activity_info.path)
 
+sys.path.append(activity_info.path)
 import webactivity
 
 # Default settings.
@@ -16,9 +17,19 @@ HOME_PAGE = '/wiki/Peru'
 # Activity class, extends WebActivity.
 class WikipediaActivity(webactivity.WebActivity):
     def __init__(self, handle):
+        
+        print "Starting server...\n"
+        
+        os.chdir(os.environ['SUGAR_BUNDLE_PATH'])
+        self.server_pid = os.spawnlp(os.P_NOWAIT, 'python', 'python', 'py/server.py', WIKIDB, HTTP_PORT)
+        
+        atexit.register(self.kill_server)
+        
         handle.uri = 'http://localhost:%s%s' % (HTTP_PORT, HOME_PAGE)
 
         webactivity.WebActivity.__init__(self, handle)
-
-        os.chdir(os.environ['SUGAR_BUNDLE_PATH'])
-        os.spawnlp(os.P_NOWAIT, 'python', 'python', 'py/server.py', WIKIDB, HTTP_PORT)
+    
+    def kill_server(self):
+        print "Stopping server...\n"
+        os.kill(self.server_pid, signal.SIGHUP)
+        
\ No newline at end of file