aboutsummaryrefslogtreecommitdiff
path: root/lib/mauve
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2011-07-18 16:44:21 +0100
committerPatrick J Cherry <patrick@bytemark.co.uk>2011-07-18 16:44:21 +0100
commitbbc6dc3fccfcdffef65211dd4d1c4058ecef624b (patch)
treebb99c37166e130ca393121cdfae8cb19f6f472ba /lib/mauve
parentd84d5fb931850955a9eb0f4a0edd0b6a00dc8ed9 (diff)
Improved code to avoid Exception when the processor attempts to freeze a thread
that is not running.
Diffstat (limited to 'lib/mauve')
-rw-r--r--lib/mauve/mauve_thread.rb12
-rw-r--r--lib/mauve/processor.rb2
-rw-r--r--lib/mauve/server.rb1
3 files changed, 6 insertions, 9 deletions
diff --git a/lib/mauve/mauve_thread.rb b/lib/mauve/mauve_thread.rb
index 4a2787d..55ec446 100644
--- a/lib/mauve/mauve_thread.rb
+++ b/lib/mauve/mauve_thread.rb
@@ -7,6 +7,7 @@ module Mauve
def initialize
@thread = nil
+ @stop = true
end
def logger
@@ -53,15 +54,13 @@ module Mauve
@frozen = true
- if @thread.is_a?(Thread)
- 20.times { Kernel.sleep 0.1 ; break if @thread.stop? }
+ 20.times { Kernel.sleep 0.1 ; break if @thread.stop? }
- logger.debug("Thread has not frozen!") unless @thread.stop?
- end
+ logger.debug("Thread has not frozen!") unless @thread.stop?
end
def frozen?
- defined? @frozen and @frozen and @thread.is_a?(Thread) and @thread.stop?
+ self.alive? and self.stop?
end
def thaw
@@ -90,7 +89,7 @@ module Mauve
end
def stop?
- @thread.is_a?(Thread) and @thread.stop?
+ !@thread.is_a?(Thread) or @thread.stop?
end
def join(ok_exceptions=[])
@@ -128,7 +127,6 @@ module Mauve
self.join
end
-
alias exit stop
def kill
diff --git a/lib/mauve/processor.rb b/lib/mauve/processor.rb
index 15987c2..e3aac54 100644
--- a/lib/mauve/processor.rb
+++ b/lib/mauve/processor.rb
@@ -36,7 +36,7 @@ module Mauve
#
break if data.nil?
- Timer.instance.freeze unless Timer.instance.frozen?
+ Timer.instance.freeze if Timer.instance.alive? and !Timer.instance.frozen?
logger.debug("Got #{data.inspect} from #{client.inspect}")
diff --git a/lib/mauve/server.rb b/lib/mauve/server.rb
index 4bd5a0f..f9ea769 100644
--- a/lib/mauve/server.rb
+++ b/lib/mauve/server.rb
@@ -149,7 +149,6 @@ module Mauve
thread_list.delete(Thread.current)
THREAD_CLASSES.each do |klass|
-
#
# No need to double check ourselves.
#