sfpagent 0.1.10 → 0.1.11

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/lib/sfpagent/bsig.rb

@@ -46,8 +46,11 @@ class Sfp::BSig
 				disable
 			}
 		}
+
 		register_satisfier_thread(:reset)
 
+		system("rm -f #{CachedDir}/operator.*.lock")
+
 		Sfp::Agent.logger.info "[#{@mode}] BSig engine is running."
 
 		puts "BSig Engine is running with PID #{$$}"
@@ -117,16 +120,16 @@ class Sfp::BSig
 		operator = select_operator(flaws, operators, pi)
 		return :failure if operator.nil?
 
-		@lock.synchronize {
-			return :ongoing if operator['selected']
-			operator['selected'] = true
-		}
-Sfp::Agent.logger.info "[#{@mode}] Selected operator: #{operator['name']}" #{JSON.generate(operator)}"
+#Sfp::Agent.logger.info "[#{@mode}] Flaws: #{JSON.generate(flaws)}"
+
+		return :ongoing if not lock_operator(operator)
 
-		next_pi = pi + 1
+		Sfp::Agent.logger.info "[#{@mode}] Selected operator: #{operator['name']}"
+
+		next_pi = operator['pi'] + 1
 		pre_local, pre_remote = split_preconditions(operator)
 
-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
@@ -143,16 +146,16 @@ Sfp::Agent.logger.info "[#{@mode}] local-flaws: #{JSON.generate(pre_local)}, rem
 			tries -= 1
 		end until tries <= 0
 
-		return :failure if status != :no_flaw
-
-		return :failure if not achieve_remote_goal(id, pre_remote, next_pi)
+		if status != :no_flaw or
+			not achieve_remote_goal(id, pre_remote, next_pi) or
+			not invoke(operator)
 
-		return :failure if not invoke(operator)
+			unlock_operator(operator) if not operator.nil?
+			return :failure
+		end
 		
+		unlock_operator(operator) if not operator.nil?
 		:repaired
-
-	ensure
-		@lock.synchronize { operator['selected'] = false } if not operator.nil?
 	end
 
 	def achieve_remote_goal(id, goal, pi)
@@ -220,6 +223,22 @@ Sfp::Agent.logger.info "[#{@mode}] local-flaws: #{JSON.generate(pre_local)}, rem
 		}
 	end
 
+	def lock_operator(operator)
+		@lock.synchronize {
+			operator_lock_file = "#{CachedDir}/operator.#{operator['name']}.lock"
+			return false if File.exist?(operator_lock_file)
+			File.open(operator_lock_file, 'w') { |f| f.write('1') }
+			return true
+		}
+	end
+
+	def unlock_operator(operator)
+		@lock.synchronize {
+			operator_lock_file = "#{CachedDir}/operator.#{operator['name']}.lock"
+			File.delete(operator_lock_file) if File.exist?(operator_lock_file)
+		}
+	end
+
 	def split_goal_by_agent(goal)
 		agents = Sfp::Agent.get_agents
 		agent_goal = {}
@@ -236,6 +255,8 @@ Sfp::Agent.logger.info "[#{@mode}] local-flaws: #{JSON.generate(pre_local)}, rem
 		data = {'id' => id,
 		        'goal' => JSON.generate(g),
 		        'pi' => pi}
+Sfp::Agent.logger.info "[#{@mode}] Request goal to: #{agent_name} [WAIT]"
+
 		code, _ = put_data(agent['sfpAddress'], agent['sfpPort'], SatisfierPath, data)
 
 Sfp::Agent.logger.info "[#{@mode}] Request goal to: #{agent_name} - status: " + code.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfpagent
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   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: &16928140 !ruby/object:Gem::Requirement
+  requirement: &7616500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 0.3.12
   type: :runtime
   prerelease: false
-  version_requirements: *16928140
+  version_requirements: *7616500
 description: A Ruby implementation of SFP agent.
 email: herry13@gmail.com
 executables: