herpes 0.0.2.6 → 0.0.2.7

data/lib/herpes/rss.rb

@@ -50,7 +50,7 @@ Herpes::Module.define :rss do
 
 			content = begin
 				open(r.url).read
-			rescue SocketError; end or next
+			rescue Exception; end or next
 
 			RSS::Parser.parse(content, false).tap {|p|
 				p.items.reverse_each {|item|

data/lib/herpes/version.rb

@@ -10,6 +10,6 @@
 
 class Herpes
 	def self.version
-		'0.0.2.6'
+		'0.0.2.7'
 	end
 end

data/lib/herpes.rb

@@ -237,6 +237,8 @@ class Herpes
 	end
 
 	def until_next
+		return 0 unless running?
+
 		callbacks = @callbacks.reject(&:calling?).reject(&:gonna_call?)
 
 		return if callbacks.empty?
@@ -255,6 +257,8 @@ class Herpes
 		while running?
 			sleep until_next
 
+			break unless running?
+
 			@callbacks.select {|callback|
 				callback.next_in <= 0 && !(callback.gonna_call? || callback.calling?)
 			}.each {|callback|
@@ -263,18 +267,20 @@ class Herpes
 				callback.gonna_call!
 
 				process {
-					callback.call(self)
+					begin
+						callback.call(self)
+					rescue Exception => e
+						(log_at ? File.open(log_at, ?a) : STDOUT).tap {|f|
+							f.write "[#{Time.now}] "
+							f.write "From: #{caller[0, 1].join "\n"}\n"
+							f.write "#{e.class}: #{e.message}\n"
+							f.write e.backtrace.to_a.join "\n"
+							f.write "\n\n"
+						}
+					end
 				}
 			}
 		end
-	rescue Exception => e
-		File.open(log_at, ?a) {|f|
-		  f.write "[#{Time.now}] "
-			f.write "From: #{caller[0, 1].join "\n"}\n"
-			f.write "#{e.class}: #{e.message}\n"
-			f.write e.backtrace.to_a.join "\n"
-			f.write "\n\n"
-		} if log_at
 	ensure
 		save
 
@@ -282,6 +288,8 @@ class Herpes
 	end
 
 	def stop!
+		return unless running?
+
 		@running = false
 
 		wake_up
@@ -291,7 +299,5 @@ class Herpes
 
 	def stop
 		stop!
-
-		sleep 0.01 until stopped?
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: herpes
 version: !ruby/object:Gem::Version
-  version: 0.0.2.6
+  version: 0.0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00.000000000 Z
+date: 2012-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: threadpool
-  requirement: &19567300 !ruby/object:Gem::Requirement
+  requirement: &16037080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19567300
+  version_requirements: *16037080
 description: 
 email: meh@paranoici.org
 executables:
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A event/notification handler.