Don't spew stack traces on CTRL-C

toolmantim · Aug 27, 2011 · 628bc0b · 628bc0b
1 parent e80cfc6
commit 628bc0b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/bin/bananajour b/bin/bananajour
@@ -28,7 +28,12 @@ when nil
   pids << Bananajour.serve_web!
   pids << Bananajour.serve_git!
   pids << Bananajour.advertise!
-  Process.waitall
+
+  begin
+    Process.waitall
+  rescue Interrupt
+    # CTRL-C, shut down cleanly (sans stack trace)
+  end
 
 when "add", "init"
   repo = Bananajour.add!(ARGV[1] || File.expand_path("."))

diff --git a/lib/bananajour/bonjour/advertiser.rb b/lib/bananajour/bonjour/advertiser.rb
@@ -20,10 +20,16 @@ def register_app
       DNSSD.register("#{Bananajour.config.name}'s bananajour", "_http._tcp,_bananajour", nil, Bananajour.web_port, tr)
     end
     def register_repos
-      loop do
+      interrupted = false
+      while !interrupted  
         stop_old_services
         register_new_repositories
-        sleep(1)
+        begin
+          sleep(1)
+        rescue Interrupt
+          # CTRL-C, shut down cleanly (sans stack trace)
+          interrupted = true
+        end
       end
     end
     def stop_old_services