commit 1aaab9720718115f254ad1c2be04240e4dfd5bc1
parent 67986d7c0e66054a654edeb7e383e66a45e861bf
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Thu, 6 Aug 2009 21:36:22 -0400
Merge branch 'ncurses-fixes' into next
Diffstat:
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/bin/sup b/bin/sup
@@ -160,7 +160,7 @@ begin
Redwood::start
Index.load
- trap("TERM") { |x| raise "so speaking as i think, i die, i die!" }
+ trap("TERM") { |x| SuicideManager.please_die! }
trap("WINCH") { |x| BufferManager.sigwinch_happened! }
if(s = Redwood::SourceManager.source_for DraftManager.source_name)
diff --git a/lib/sup/suicide.rb b/lib/sup/suicide.rb
@@ -14,6 +14,7 @@ class SuicideManager
end
bool_reader :die
+ def please_die!; @die = true end
def start
@thread = Redwood::reporting_thread("suicide watch") do