rubix 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/rubix/connection.rb

@@ -54,7 +54,7 @@ module Rubix
 
     def till_response attempt=1, max_attempts=5, &block
       response = block.call
-      Rubix.logger.log(Logger::DEBUG, response.body, 'RECV') if Rubix.logger
+      Rubix.logger.log(Logger::DEBUG, "RECV: #{response.body}") if Rubix.logger
       case
       when response.code.to_i >= 500 && attempt <= max_attempts
         sleep 1                 # FIXME make the sleep time configurable...
@@ -82,7 +82,7 @@ module Rubix
 
     def raw_post_request raw_params
       json_body = raw_params.to_json
-      Rubix.logger.log(Logger::DEBUG, json_body, 'SEND') if Rubix.logger
+      Rubix.logger.log(Logger::DEBUG, "SEND: #{json_body}") if Rubix.logger
       Net::HTTP::Post.new(uri.path).tap do |req|
         req['Content-Type'] = 'application/json-rpc'
         req.body            = json_body

data/lib/rubix/log.rb

@@ -14,7 +14,6 @@ module Rubix
   def self.default_logger
     @logger       = Logger.new(default_log_path)
     @logger.level = default_log_severity
-    p default_log_severity
     @logger
   end
 
@@ -50,33 +49,29 @@ module Rubix
       
   module Logs
 
-    def log_name
-      @log_name
-    end
-    
     def debug *args
       return unless Rubix.logger
-      Rubix.logger.log(Logger::DEBUG, args.join(' '), log_name)
+      Rubix.logger.log(Logger::DEBUG, args.join(' '))
     end
 
     def info *args
       return unless Rubix.logger
-      Rubix.logger.log(Logger::INFO, args.join(' '), log_name)
+      Rubix.logger.log(Logger::INFO, args.join(' '))
     end
 
     def warn *args
       return unless Rubix.logger
-      Rubix.logger.log(Logger::WARN, args.join(' '), log_name)
+      Rubix.logger.log(Logger::WARN, args.join(' '))
     end
 
     def error *args
       return unless Rubix.logger
-      Rubix.logger.log(Logger::ERROR, args.join(' '), log_name)
+      Rubix.logger.log(Logger::ERROR, args.join(' '))
     end
 
     def fatal *args
       return unless Rubix.logger
-      Rubix.logger.log(Logger::FATAL, args.join(' '), log_name)
+      Rubix.logger.log(Logger::FATAL, args.join(' '))
     end
     
   end

data/lib/rubix/models/application.rb

@@ -35,10 +35,6 @@ module Rubix
       new(params)
     end
     
-    def log_name
-      "APP #{name || id}@#{host.name}"
-    end
-
     def self.id_field
       'applicationid'
     end

data/lib/rubix/models/host.rb

@@ -49,10 +49,6 @@ module Rubix
           })
     end
     
-    def log_name
-      "HOST #{name || id}"
-    end
-
     def self.id_field
       'hostid'
     end
@@ -104,13 +100,12 @@ module Rubix
       request('host.update', params.merge('hostid' => id))
     end
 
-    def after_update
+    def before_update
       response = request('host.massUpdate', { 'groups' => host_group_params, 'templates' => template_params, 'macros' => user_macro_params, 'hosts' => [{'hostid' => id}]})
       if response.has_data?
-        info("Updated templates, host groups, & macros")
         true
       else
-        error("Could not update all templates, host groups, and/or macros: #{response.error_message}")
+        error("Could not update all templates, host groups, and/or macros for #{resource_name}: #{response.error_message}")
         false
       end
     end

data/lib/rubix/models/host_group.rb

@@ -28,15 +28,10 @@ module Rubix
           })
     end
     
-    def log_name
-      "GROUP #{name || id}"
-    end
-
     def self.id_field
       'groupid'
     end
     
-
     #
     # == Associations ==
     #

data/lib/rubix/models/item.rb

@@ -78,10 +78,6 @@ module Rubix
           })
     end
     
-    def log_name
-      "ITEM #{key}@#{host.name}"
-    end
-
     def self.id_field
       'itemid'
     end

data/lib/rubix/models/model.rb

@@ -9,18 +9,17 @@ module Rubix
     extend Logs
     include Logs
 
-    def self.model_name
+    def self.resource_name
       self.to_s.split('::').last
     end
 
-    def self.log_name
-      model_name
+    def resource_name
+      "#{self.class.resource_name} #{respond_to?(:name) ? self.name : self.id}"
     end
 
     def initialize properties={}
       @properties = properties
       @id         = properties[:id]
-      @log_name   = self.class.model_name
     end
     
     def new_record?
@@ -43,7 +42,7 @@ module Rubix
       when response.success?
         # a successful but empty response means it wasn't found
       else
-        error("Could not find #{options.inspect}: #{response.error_message}")
+        error("Error finding #{resource_name} using #{options.inspect}: #{response.error_message}")
         nil
       end
     end
@@ -62,7 +61,7 @@ module Rubix
           false
         end
       else
-        error("Could not create #{options.inspect}: #{response.error_message}")
+        error("Error creating #{resource_name} using #{options.inspect}: #{response.error_message}")
         false
       end
     end
@@ -77,31 +76,29 @@ module Rubix
       if response.has_data?
         @id = response.result[self.class.id_field + 's'].first.to_i
         info("Created")
-        true
       else
-        error("Could not create: #{response.error_message}")
-        false
+        error("Error creating #{resource_name}: #{response.error_message}")
+        return false
       end
     end
 
     def update
       return false unless validate
       return create if new_record?
+      return false unless before_update
       response = update_request
       if response.has_data?
         info("Updated")
-        after_update
       else
-        error("Could not update: #{response.error_message}")
-        false
+        error("Error updating #{resource_name}: #{response.error_message}")
+        return false
       end
-      after_update
     end
 
-    def after_update
+    def before_update
       true
     end
-
+    
     def save
       new_record? ? create : update
     end
@@ -111,13 +108,13 @@ module Rubix
       response = destroy_request
       case
       when response.has_data? && response.result.values.first.first.to_i == id
-        info("Destroyed")
+        info("Destroyed #{resource_name}")
         true
       when response.zabbix_error? && response.error_message =~ /does not exist/i
         # was never there
         true
       else
-        error("Could not destroy: #{response.error_message}")
+        error("Could not destroy #{resource_name}: #{response.error_message}")
         false
       end
     end

data/lib/rubix/models/template.rb

@@ -39,10 +39,6 @@ module Rubix
           })
     end
 
-    def log_name
-      "TEMPLATE #{name || id}"
-    end
-
     def self.id_field
       'templateid'
     end

data/lib/rubix/models/user_macro.rb

@@ -30,10 +30,6 @@ module Rubix
           })
     end
     
-    def log_name
-      "MACRO #{macro_name}@#{host.name}"
-    end
-
     def self.unmacro_name name
       (name || '').gsub(/^\{\$/, '').gsub(/\}$/, '').upcase
     end

data/lib/rubix/sender.rb

@@ -29,15 +29,14 @@ module Rubix
       @settings = settings
       confirm_settings
       self.host = Host.new(:name => settings['host'])
-      @log_name = "PIPE #{host.name}"
       if settings['fast']
-        info("Forwarding...") if settings['verbose']
+        info("Forwarding for #{self.host.name}...") if settings['verbose']
       else
         initialize_hostgroups
         initialize_templates
         initialize_host
         initialize_applications
-        info("Forwarding...") if settings['verbose'] && host.exists?
+        info("Forwarding for #{self.host.name}...") if settings['verbose'] && host.exists?
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubix
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Dhruv Bansal