rhcp 0.2.15 → 0.2.16

data/lib/rhcp.rb

@@ -23,7 +23,7 @@ module RHCP #:nodoc:
     
     MAJOR = 0
     MINOR = 2
-    TINY  = 15
+    TINY  = 16
 
     def Version.to_s
       [ MAJOR, MINOR, TINY ].join(".")

data/lib/rhcp/context.rb

@@ -14,27 +14,27 @@ module RHCP
       @cookies = cookies
     end       
     
-    def to_json(*args)
-      {
-        'cookies' => @cookies,
-      }.to_json(*args)
-    end  
-    
-    def self.reconstruct_from_json(json_data)
-      $logger.debug "reconstructing context from json : >>#{json_data}<<"
-      object = JSON.parse(json_data)
-      instance = self.new()
-      instance.cookies = object['cookies'] 
-      
-      instance
-    end
+    # def to_json(*args)
+      # {
+        # 'cookies' => @cookies,
+      # }.to_json(*args)
+    # end  
+#     
+    # def self.reconstruct_from_json(json_data)
+      # $logger.debug "reconstructing context from json : >>#{json_data}<<"
+      # object = JSON.parse(json_data)
+      # instance = self.new()
+      # instance.cookies = object['cookies'] 
+#       
+      # instance
+    # end
 
     def to_s
-      result = "<Context cookies:"
-      @cookies.each do |k,v|
-        result += " '#{k}'='#{v}'"
-      end
-      result += ">"
+      result = "<Context with #{@cookies.size} cookies>"
+      # @cookies.each do |k,v|
+        # result += " '#{k}'='#{v}'"
+      # end
+      # result += ">"
       result
     end
     

data/lib/rhcp/logging_broker.rb

@@ -8,6 +8,7 @@ module RHCP
       super()
       @wrapped_broker = wrapped_broker
       @logger = RHCP::ModuleHelper::instance.logger
+      @blacklisted_commands = [ "log_to_jabber", "log_to_jabber_detail", "on_host", "hostname", "ssh_options_for_machine" ]
     end
 
     def get_command_list(context = RHCP::Context.new())
@@ -22,22 +23,24 @@ module RHCP
       @wrapped_broker.clear()
     end
     
+    def blacklist_defaults
+      [ "log_to_jabber", "log_to_jabber_detail", "on_host", "hostname", "ssh_options_for_machine" ]
+    end
+    
     def get_blacklisted_commands
-      [ "log_to_jabber", "log_to_jabber_detail", "on_host", "hostname" ]
+      []
     end
     
+    def graylist
+      [ "on_machine", "list_machines" ]
+    end
     
     # TODO would be nice if this helper method would be accessible from inside vop plugins
     def var_name(name)
       self.class.to_s + "." + name
     end
     
-    def execute(request)
-      blacklisted = get_blacklisted_commands.include?(request.command.name)
-      if not blacklisted and request.context.cookies.has_key?('__loggingbroker.blacklisted_commands') then
-        blacklisted = request.context.cookies['__loggingbroker.blacklisted_commands'].split(',').include?(request.command.name)
-      end
-  
+    def execute(request) 
       command = get_command(request.command.name, request.context)
       mode = command.is_read_only ? 'r/o' : 'r/w'
   
@@ -52,25 +55,52 @@ module RHCP
       
       level = Thread.current[var_name("stack")].size()
       
-      unless blacklisted    
+      blacklist = blacklist_defaults + get_blacklisted_commands
+      blacklisted = false
+      blacklist.each do |sheep|
+        if Thread.current[var_name("stack")].include?(sheep)
+          blacklisted = true
+          break
+        end
+      end
+      if not blacklisted 
+        if request.context.cookies.has_key?('__loggingbroker.blacklisted_commands') then
+          blacklisted = request.context.cookies['__loggingbroker.blacklisted_commands'].split(',').include?(request.command.name)
+        end
+      end
+      
+      graylisted = graylist.include? command.name
+      
+      unless blacklisted or graylisted
         #$logger.info ">> #{command.name} (#{mode}) : #{Thread.current[var_name("stack")].join(" -> ")}"
         start_ts = Time.now()
-        log_request_start(Thread.current[var_name("request_id")], level, mode, Thread.current[var_name("stack")], request, start_ts)
+        log_request_start(Thread.current[var_name("request_id")], level, mode, stack_for_display, request, start_ts)
       end
       
       response = @wrapped_broker.execute(request)
       
-      unless blacklisted
+      
+      unless blacklisted or graylisted
         stop_ts = Time.now()
         duration = stop_ts.to_i - start_ts.to_i
         
-        log_request_stop(Thread.current[var_name("request_id")], level, mode, Thread.current[var_name("stack")], request, response, duration)
+        log_request_stop(Thread.current[var_name("request_id")], level, mode, stack_for_display, request, response, duration)
       end
       
       Thread.current[var_name("stack")].pop
       
+      if level == 1
+        Thread.current[var_name("request_id")] = nil
+      end
+      
       response
     end
+    
+    def stack_for_display
+      Thread.current[var_name("stack")].select do |command_name|
+        not graylist.include? command_name
+      end.join(".")
+    end
 
     def log_request_start(request_id, level, mode, current_stack, request, start_ts)
       $logger.debug("> #{request_id} #{level} [#{mode}] #{current_stack.join('.')} #{request}")

data/lib/rhcp/request.rb

@@ -94,29 +94,46 @@ module RHCP
     # Params:
     #   +broker+ is the broker to use for command lookup
     #   +json_data+ is the JSON data that represents the request
-    def self.reconstruct_from_json(broker, json_data)
-      object = JSON.parse(json_data)
-      
-      context = object.has_key?('context') ?
-        RHCP::Context.reconstruct_from_json(object['context']) :
-        RHCP::Context.new(object['cookies'])
-        
-      command = broker.get_command(object['command_name'], context)      
-        
-      self.new(command, object['param_values'], context)
-    end
-
-    # returns a JSON representation of this request.
-    def to_json(*args)
+    # def self.reconstruct_from_json(broker, json_data)
+      # object = JSON.parse(json_data)
+#       
+      # context = object.has_key?('context') ?
+        # RHCP::Context.reconstruct_from_json(object['context']) :
+        # RHCP::Context.new(object['cookies'])
+#         
+      # command = broker.get_command(object['command_name'], context)      
+#         
+      # self.new(command, object['param_values'], context)
+    # end
+# 
+    # # returns a JSON representation of this request.
+    # def to_json(*args)
+      # {
+        # 'command_name' => @command.name,
+        # 'param_values' => @param_values,
+        # 'context' => @context.to_json
+      # }.to_json(*args)
+    # end
+    
+    def as_json(options={})
       {
-        'command_name' => @command.name,
-        'param_values' => @param_values,
-        'context' => @context.to_json
-      }.to_json(*args)
+        :command_name => @command.name,
+        :param_values => @param_values,
+        :context => @context
+      }
     end
 
     def to_s
-      "#{@command.name} (#{@param_values})"
+      s = @command.name + ' ('
+      count = 0
+      @param_values.each do |k,v|
+        next if v.class == Proc.class
+        count += 1
+        s += ' ' unless count == 1
+        s += "#{k} => #{v}"
+      end
+      s += ')'
+      s
     end
 
   end

data/lib/rhcp/response.rb

@@ -45,29 +45,16 @@ module RHCP
       @context = new_context
     end
     
-    def self.reconstruct_from_json(json_data)
-      object = JSON.parse(json_data)
-      instance = self.new()
-      instance.status = object["status"]
-      instance.error_text = object["error_text"]
-      instance.error_detail = object["error_detail"]
-      instance.set_payload(object["data"])
-      instance.result_text = object['result_text']
-      instance.context = object['cookies']
-      instance.created_at = object['created_at']
-      instance
-    end
-    
-    def to_json(*args)
+    def as_json(options = {})
       {
-        'status' => @status,
-        'error_text' => @error_text,
-        'error_detail' => @error_detail,
-        'data' => @data,   # TODO what about JSONinification of data? (probably data should be JSON-ish data only, i.e. no special objects)
-        'result_text' => @result_text,
-        'cookies' => @context,
-        'created_at' => @created_at
-      }.to_json(*args)
+        :status => @status,
+        :error_text => @error_text,
+        :error_detail => @error_detail,
+        :data => @data,   # TODO what about JSONinification of data? (probably data should be JSON-ish data only, i.e. no special objects)
+        :result_text => @result_text,
+        :context => @context,
+        :created_at => @created_at
+      }
     end    
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhcp
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 2
-  - 15
-  version: 0.2.15
+  - 16
+  version: 0.2.16
 platform: ruby
 authors: 
 - Philipp Traeder
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-12 00:00:00 +01:00
+date: 2011-11-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,7 +63,6 @@ files:
 - test/rhcp/test_base.rb
 - test/rhcp/command_param_test.rb
 - test/rhcp/context_aware_broker_test.rb
-- test/rhcp/rhcp.log
 - test/rhcp/request_test.rb
 - test/rhcp/tests_for_brokers.rb
 - test/rhcp/http_exporter_test.rb

data/test/rhcp/rhcp.log

@@ -1,20 +0,0 @@
-# Logfile created on Sat Nov 12 22:54:42 +0100 2011 by logger.rb/22285
-D, [2011-11-12T22:54:42.004418 #8757] DEBUG -- : enabling command context_test because of context key host
-D, [2011-11-12T22:54:42.004543 #8757] DEBUG -- : initializing request test with params first_paramthing
-D, [2011-11-12T22:54:42.004588 #8757] DEBUG -- : request initialized : command 'test', params : first_param=thing
-D, [2011-11-12T22:54:42.004623 #8757] DEBUG -- : gonna execute request >>test (first_paramthing)<<
-D, [2011-11-12T22:54:42.004736 #8757] DEBUG -- : initializing request not working with params 
-D, [2011-11-12T22:54:42.004771 #8757] DEBUG -- : request initialized : command 'not working', params : 
-D, [2011-11-12T22:54:42.004802 #8757] DEBUG -- : gonna execute request >>not working ()<<
-D, [2011-11-12T22:54:42.004922 #8757] DEBUG -- : initializing request test with params first_paramthe_value
-D, [2011-11-12T22:54:42.004961 #8757] DEBUG -- : request initialized : command 'test', params : first_param=the_value
-D, [2011-11-12T22:54:42.004997 #8757] DEBUG -- : gonna execute request >>test (first_paramthe_value)<<
-D, [2011-11-12T22:54:42.005214 #8757] DEBUG -- : initializing request test with params does_not_existsingle value for non-existing param
-D, [2011-11-12T22:54:42.005256 #8757] DEBUG -- : request initialized : command 'test', params : does_not_exist=single value for non-existing param
-D, [2011-11-12T22:54:42.005291 #8757] DEBUG -- : gonna execute request >>test (does_not_existsingle value for non-existing param)<<
-D, [2011-11-12T22:54:42.005413 #8757] DEBUG -- : initializing request test with params real_paramvalue for the real paramanother value for the real param
-D, [2011-11-12T22:54:42.005452 #8757] DEBUG -- : request initialized : command 'test', params : real_param=value for the real param,another value for the real param
-D, [2011-11-12T22:54:42.005513 #8757] DEBUG -- : gonna execute request >>test (real_paramvalue for the real paramanother value for the real param)<<
-D, [2011-11-12T22:54:42.005661 #8757] DEBUG -- : initializing request test with params 
-D, [2011-11-12T22:54:42.005701 #8757] DEBUG -- : request initialized : command 'test', params : 
-D, [2011-11-12T22:54:42.005733 #8757] DEBUG -- : gonna execute request >>test ()<<