sfpagent 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/bin/install_module

@@ -24,6 +24,10 @@ fi
 # set a template command for sending the modules
 cmd="curl -s -i -X PUT $address:$port/modules"
 
+# setup directory for temporary files
+dir="/tmp/"$(date +%s%N)"$RANDOM"
+mkdir -p $dir
+
 # for every module in the arguments:
 # - archive the module's files to a temporary file
 # - update the sending command by adding the module
@@ -32,8 +36,8 @@ cmd="curl -s -i -X PUT $address:$port/modules"
 missing_module=0
 for module in "$@" ; do
 	if [[ -d "$module" ]]; then
-		tar cvzhf /tmp/$module.tgz $module 1>/dev/null
-		cmd="$cmd -F $module=@/tmp/$module.tgz"
+		tar cvzhf $dir/$module.tgz $module 1>/dev/null
+		cmd="$cmd -F $module=@$dir/$module.tgz"
 	else
 		echo "Module $module is not exist!"
 		missing_module=`expr $missing_module + 1`
@@ -49,10 +53,8 @@ if [[ $missing_module == 0 ]]; then
 	fi
 fi
 
-# delete temporary archive files
-for module in "$@"; do
-	rm -f /tmp/$module.tgz
-done
+# delete directory that holds temporary files
+rm -rf $dir
 
 if [[ $missing_module == 0 ]]; then
 	echo "status: ok"

data/lib/sfpagent/agent.rb

@@ -560,6 +560,7 @@ module Sfp
 			}
 
 			if updated
+				@@agents_database = agents
 				Thread.new {
 					# if updated then broadcast to other agents
 					http_data = {'agents' => JSON.generate(data)}
@@ -579,7 +580,9 @@ module Sfp
 
 		def self.get_agents
 			return {} if not File.exist?(AgentsDataFile)
-			return @@agents_database if File.mtime(AgentsDataFile) == @@agents_database_modified_time
+			modified_time = File.mtime(AgentsDataFile)
+			return @@agents_database if modified_time == @@agents_database_modified_time and
+			                            (Time.new - modified_time) < 60
 			@@agents_database_modified_time = File.mtime(AgentsDataFile)
 			@@agents_database = JSON[File.read(AgentsDataFile)]
 		end

metadata

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