sfpagent 0.2.8 → 0.2.9

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.9

data/lib/sfpagent/bsig.rb

@@ -68,7 +68,7 @@ class Sfp::BSig
 					if exec_status == :failure
 						Sfp::Agent.logger.error "[main] Executing BSig model [Failed]"
 						sleep SleepTime
-					elsif exec_status == :no_flaw
+					elsif exec_status == :no_flaw or exec_status == :pending
 						sleep SleepTime
 					end
 				end
@@ -102,7 +102,7 @@ class Sfp::BSig
 	# @return
 	#   :no_flaw  => there is no goal-flaw
 	#   :failure  => there is a failure on achieving the goal
-	#   :ongoing  => the selected operator is being executed
+	#   :pending  => the selected operator is being executed
 	#   :repaired => some goal-flaws have been repaired, but the goal may have other flaws
 	#
 	def sequential_achieve_local_goal(id, goal, operators, pi, mode)
@@ -127,12 +127,14 @@ class Sfp::BSig
 	# @return
 	#   :no_flaw  => there is no goal-flaw
 	#   :failure  => there is a failure on achieving the goal
-	#   :ongoing  => the selected operator is being executed
+	#   :pending  => the selected operator is being executed
 	#   :repaired => some goal-flaws have been repaired, but the goal may have other flaws
 	#
 	def achieve_local_goal(id, goal, operators, pi, mode)
 		current = get_current_state
 		flaws = compute_flaws(goal, current)
+		Sfp::Agent.logger.info "[#{mode}] flaws: #{flaws.inspect}"
+
 		return :no_flaw if flaws.length <= 0
 		
 		operators = select_operators(flaws, operators, pi)
@@ -142,19 +144,19 @@ class Sfp::BSig
 
 		total = operators.length
 		status = []
-		operators_lock = Mutex.new
+		lock = Mutex.new
 		operators.each do |operator|
 			Thread.new {
 				stat = execute_operator(operator, id, operators, mode)
-				Sfp::Agent.logger.info "[#{mode}] #{operator['name']}{#{JSON.generate(operator['parameters'])}} => #{stat}"
-				operators_lock.synchronize { status << stat }
+				Sfp::Agent.logger.info "[#{mode}] Execute_operator: #{operator['name']}#{JSON.generate(operator['parameters'])} => #{stat}"
+				lock.synchronize { status << stat }
 			}
 		end
 		wait? { status.length >= operators.length }
 		Sfp::Agent.logger.info "[#{mode}] exec status: #{status.inspect}"
 		status.each { |stat|
 			return :failure if stat == :failure
-			return :ongoing if stat == :ongoing
+			return :pending if stat == :pending
 		}
 		:repaired
 	end
@@ -166,18 +168,18 @@ class Sfp::BSig
 	end
 	
 	def execute_operator(operator, id, operators, mode)
-		return :ongoing if not lock_operator(operator)
+		return :pending if not lock_operator(operator)
 
 		status = :failure
 
 		begin
-			Sfp::Agent.logger.info "[#{mode}] Selected operator: #{operator['id']}:#{operator['name']}{#{JSON.generate(operator['parameters'])}}"
+			Sfp::Agent.logger.info "[#{mode}] Selected operator: #{operator['id']}:#{operator['name']}#{JSON.generate(operator['parameters'])}"
 	
 			next_pi = operator['pi'] + 1
 			pre_local, pre_remote = split_preconditions(operator)
 	
 			# debugging
-			#Sfp::Agent.logger.info "[#{mode}] local-flaws: #{JSON.generate(pre_local)}, remote-flaws: #{JSON.generate(pre_remote)}"
+			Sfp::Agent.logger.info "[#{mode}] local-flaws: #{JSON.generate(pre_local)}, remote-flaws: #{JSON.generate(pre_remote)}"
 	
 			status = nil
 			tries = MaxTries
@@ -185,14 +187,16 @@ class Sfp::BSig
 				status = achieve_local_goal(id, pre_local, operators, next_pi, mode)
 				if status == :no_flaw or status == :failure or not @enabled
 					break
-				elsif status == :ongoing
+				elsif status == :pending
 					sleep SleepTime
 					tries += 1
 				elsif status == :repaired
 					tries = MaxTries
 				end
 				tries -= 1
-			end until tries <= 0
+			end until tries <= 0 and @enabled
+
+			Sfp::Agent.logger.info "[#{mode}] achieve_local_goal => #{status}"
 	
 			if status != :no_flaw or
 				not achieve_remote_goal(id, pre_remote, next_pi, mode) or
@@ -263,7 +267,7 @@ class Sfp::BSig
 			status = achieve_local_goal(bsig['id'], goal, bsig['operators'], pi, :satisfier)
 			if status == :no_flaw or status == :failure or not @enabled
 				break
-			elsif status == :ongoing
+			elsif status == :pending
 				sleep SleepTime
 				tries += 1
 			elsif status == :repaired
@@ -329,12 +333,14 @@ class Sfp::BSig
 
 	def send_goal_to_agent(agent, id, goal, pi, agent_name='', mode)
 		begin
-			data = {'id' => id,
-			        'goal' => JSON.generate(goal),
-			        'pi' => pi}
-			Sfp::Agent.logger.info "[#{mode}] Request goal to #{agent_name} [WAIT]"
+			data = {
+				'id' => id,
+				'goal' => JSON.generate(goal),
+				'pi' => pi
+			}
+			Sfp::Agent.logger.info "[#{mode}] Request goal to #{agent_name}@#{agent['sfpAddress']}:#{agent['sfpPort']} [WAIT]"
 			code, _ = put_data(agent['sfpAddress'], agent['sfpPort'], SatisfierPath, data)
-			Sfp::Agent.logger.info "[#{mode}] Request goal to #{agent_name} - status: #{code}"
+			Sfp::Agent.logger.info "[#{mode}] Request goal to #{agent_name}@#{agent['sfpAddress']}:#{agent['sfpPort']} #{code}"
 			(code == '200')
 		rescue Exception => exp
 			Sfp::Agent.logger.info "[#{mode}] Request goal to #{agent_name} - error: #{exp}\n#{exp.bracktrace.join("\n")}"

data/lib/sfpagent/helper.rb

@@ -28,7 +28,7 @@ module Sfp::Helper::Net
 		http_request(uri, req, open_timeout, read_timeout)
 	end
 
-	private
+	protected
 	def create_uri(address, port, path)
 		address = address.to_s.strip
 		port = port.to_s.strip

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfpagent
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sfp
-  requirement: &19482160 !ruby/object:Gem::Requirement
+  requirement: &7372320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 0.3.12
   type: :runtime
   prerelease: false
-  version_requirements: *19482160
+  version_requirements: *7372320
 description: A Ruby implementation of SFP agent.
 email: herry13@gmail.com
 executables: