0
@@ -372,23 +372,22 @@ void ebb_server_free(ebb_server *server)
0
 
0
 void ebb_server_stop(ebb_server *server)
0
 {
0
-  ebb_info("Stopping ebb server");
0
-  assert(server->open);
0
-  
0
-  int i;
0
-  ebb_client *client;
0
-  for(i=0; i < EBB_MAX_CLIENTS; i++)
0
-    ebb_client_close(client);
0
-  
0
-  if(server->request_watcher) {
0
-    printf("killing request watcher\n");
0
-    ev_io_stop(server->loop, server->request_watcher);
0
-    free(server->request_watcher);
0
-    server->request_watcher = NULL;
0
+  if(server->open) {
0
+    ebb_info("Stopping Ebb server");
0
+    int i;
0
+    ebb_client *client;
0
+    for(i=0; i < EBB_MAX_CLIENTS; i++)
0
+      ebb_client_close(client);
0
+    
0
+    if(server->request_watcher) {
0
+      ev_io_stop(server->loop, server->request_watcher);
0
+      free(server->request_watcher);
0
+      server->request_watcher = NULL;
0
+    }
0
+    
0
+    close(server->fd);
0
+    server->open = FALSE;
0
   }
0
-  
0
-  close(server->fd);
0
-  server->open = FALSE;
0
 }
0
 
0
 

0
@@ -76,10 +76,11 @@ module Ebb
0
     end
0
     
0
     def start
0
-      trap('INT')  { puts "got INT"; stop }
0
-      trap('TERM') { puts "got TERM"; stop }
0
-      _start
0
-      while process_connections
0
+      trap('INT')  { @running = false }
0
+      trap('TERM') { @running = false }
0
+      really_start
0
+      @running = true
0
+      while process_connections and @running
0
         unless @waiting_clients.empty?
0
           if $debug
0
             puts "#{@waiting_clients.length} waiting clients" if @waiting_clients.length > 1
0
@@ -89,6 +90,8 @@ module Ebb
0
           client.start_writing
0
         end
0
       end
0
+    ensure
0
+      stop
0
     end
0
   end
0
   

0
@@ -217,7 +217,7 @@ void Init_ebb_ext()
0
   rb_define_alloc_func(cServer, server_alloc);
0
   rb_define_method(cServer, "init", server_init, 2);
0
   rb_define_method(cServer, "process_connections", server_process_connections, 0);
0
-  rb_define_method(cServer, "_start", server_start, 0);
0
+  rb_define_method(cServer, "really_start", server_start, 0);
0
   rb_define_method(cServer, "stop", server_stop, 0);
0
   
0
   rb_define_method(cClient, "write", client_write, 1);