brown 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80d8b8839069b1aef10dc6a78f8d300b7f0d0191
-  data.tar.gz: 76552fb92abda3c6e4362fb8bcc12f2a602c8e14
+  metadata.gz: 02ab3890a3b264186f6ad050332e0e13f897ec3a
+  data.tar.gz: d9e120a8aa6478c5551c21fc9868e2b2a892a60e
 SHA512:
-  metadata.gz: 71edb2cda3ba54528d608bc5032e008d501bfd79de97cbb168516ca407c1086ae46fc2a9d21645d6ba5346a03e1534a32261a913338f1326f238a481b1d33b50
-  data.tar.gz: e1bc450d4ab6eeb14aae29184676481598c25a43b949b596f28e279a462d6f0924da00cdd26897432fec6cf81692b977fb6af5eb5970994098e82aaa2cc1410b
+  metadata.gz: 781654a0fbf0643dbae1b2a481a14b3ca21dd3d58ae3b8ec5c3555c2f2f7bcc4cc9865e9ea4417a125ceba391366052f196f3dd72713a7254a4cddf7496774c0
+  data.tar.gz: 10e4dca65cd6f577ac9f604e3a0678584d9281f0a23863702c03c5013aa67c4f73b8241c26f97c5f7775e836da151948d03853a2d34754b2519e23de0798766b

data/bin/brown

@@ -27,6 +27,7 @@ agents = []
 
 def stop_agents(agents)
 	agents.each do |th|
+		Brown::Agent.logger.debug { "Stopping agent #{th[:agent_class].inspect} (thread #{th.inspect})" }
 		th[:agent_class] && th[:agent_class].stop
 	end
 end
@@ -60,6 +61,7 @@ agent_classes.each do |klass|
 	agents << th
 
 	Brown::Agent.logger.info { "Started agent #{klass}" }
+	Brown::Agent.logger.debug { "Agent thread is #{th.inspect}" }
 end
 
 loop do
@@ -67,30 +69,30 @@ loop do
 		break
 	end
 
+	sleep 0.5
+
 	agents.each do |th|
-		unless th.alive?
-			begin
-				th.join(0.5)
-			rescue Exception => ex
-				Brown::Agent.logger.fatal { "Agent #{th[:agent_class]} crashed: #{ex.message} (#{ex.class})" }
-				Brown::Agent.logger.info { ex.backtrace.map { |l| "  #{l}" }.join("\n") }
-
-				Brown::Agent.logger.info { "Re-starting #{klass} agent" }
-
-				new_th = Thread.new(klass) do |klass|
-					Thread.current[:agent_class] = klass
-					klass.run
-				end
-
-				agents << new_th
-			else
-				Brown::Agent.logger.warn "Agent #{th[:agent_class]} exited cleanly; not restarting"
+		Brown::Agent.logger.debug { "Examining agent thread #{th.inspect}" }
+		begin
+			if th.join(0.5)
+				Brown::Agent.logger.info { "Agent #{th[:agent_class]} exited cleanly; not restarting" }
+				agents.delete(th)
 			end
+		rescue Exception => ex
+			Brown::Agent.logger.fatal { "Agent #{th[:agent_class]} crashed: #{ex.message} (#{ex.class})" }
+			Brown::Agent.logger.info { ex.backtrace.map { |l| "  #{l}" }.join("\n") }
+
+			Brown::Agent.logger.info { "Re-starting #{klass} agent" }
 
 			klass = th[:agent_class]
-			th[:agent_class] = nil
 			agents.delete(th)
+
+			agents << Thread.new(klass) do |klass|
+				Thread.current[:agent_class] = klass
+				klass.run
+			end
 		end
+
 	end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brown
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Matt Palmer