sfpagent 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/bin/sfpagent

@@ -16,6 +16,7 @@ EOS
 
 	opt :start, "Start the agent. If --daemon option is set true, then the agent will start as a daemon."
 	opt :stop, "Stop the daemon agent."
+	opt :restart, "Restart the daemon agent."
 	opt :status, "Print the status of the daemon agent."
 	opt :state, "Given a model, print the state of all modules. (Note: [model-file] should be specified.)"
 	opt :execute, "Given a model, execute a plan in given file. (Note: [model-file] should be specified.)"
@@ -44,6 +45,10 @@ if opts[:start]
 elsif opts[:stop]
 	Sfp::Agent.stop
 
+elsif opts[:restart]
+	Sfp::Agent.stop
+	Sfp::Agent.start(opts)
+
 elsif opts[:status]
 	Sfp::Agent.status
 

data/lib/sfpagent/agent.rb

@@ -6,6 +6,7 @@ require 'thread'
 require 'uri'
 require 'net/http'
 require 'logger'
+require 'json'
 
 module Sfp
 	module Agent
@@ -242,12 +243,13 @@ module Sfp
 		#
 		def self.execute_action(action)
 			logger = (@@config[:daemon] ? @@logger : Logger.new(STDOUT))
+			action_string = "#{action['name']} #{JSON.generate(action['parameters'])}"
 			begin
 				result = @@runtime.execute_action(action)
-				logger.info "Executing #{action['name']} " + (result ? "[OK]" : "[Failed]")
+				logger.info "Executing #{action_string} " + (result ? "[OK]" : "[Failed]")
 				return result
 			rescue Exception => e
-				logger.info "Executing #{action['name']} [Failed] #{e}\n#{e.backtrace.join("\n")}"
+				logger.info "Executing #{action_string} [Failed] #{e}\n#{e.backtrace.join("\n")}"
 				logger.error "#{e}\n#{e.bracktrace.join("\n")}"
 			end
 			false
@@ -261,26 +263,25 @@ module Sfp
 		def self.load_modules(p={})
 			dir = p[:modules_dir]
 
-			logger = @@logger # (p[:daemon] ? @@logger : Logger.new(STDOUT))
 			@@modules = []
 			counter = 0
 			if dir != '' and File.exist?(dir)
-				logger.info "Modules directory: #{dir}"
+				@@logger.info "Modules directory: #{dir}"
 				Dir.entries(dir).each { |name|
 					next if name == '.' or name == '..' or File.file?("#{dir}/#{name}")
 					module_file = "#{dir}/#{name}/#{name}.rb"
 					next if not File.exist?(module_file)
 					begin
 						load module_file #require module_file
-						logger.info "Loading module #{dir}/#{name} [OK]"
+						@@logger.info "Loading module #{dir}/#{name} [OK]"
 						counter += 1
 						@@modules << name
 					rescue Exception => e
-						logger.warn "Loading module #{dir}/#{name} [Failed]\n#{e}"
+						@@logger.warn "Loading module #{dir}/#{name} [Failed]\n#{e}"
 					end
 				}
 			end
-			logger.info "Successfully loading #{counter} modules."
+			@@logger.info "Successfully loading #{counter} modules."
 		end
 
 		def self.get_schemata(module_name)

data/lib/sfpagent/runtime.rb

@@ -3,10 +3,9 @@ require 'thread'
 class Sfp::Runtime
 	attr_reader :modules
 
-	def initialize(parser)
+	def initialize(model)
 		@mutex_procedure = Mutex.new
-		@parser = parser
-		@root = @parser.root
+		@root = model
 		@modules = nil
 	end
 
@@ -122,15 +121,16 @@ class Sfp::Runtime
 		end
 
 		root = Sfp::Helper.deep_clone(@root)
-		root.accept(Sfp::Visitor::ParentEliminator.new)
+		root.accept(ParentEliminator)
 		@modules, state = get_object_state(root, root, as_sfp)
-
 		@modules.accept(ParentGenerator)
 
 		state
 	end
 
 	protected
+	ParentEliminator = Sfp::Visitor::ParentEliminator.new
+
 	ParentGenerator = Object.new
 	def ParentGenerator.visit(name, value, parent)
 		value['_parent'] = parent if value.is_a?(Hash)

metadata

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