new_backup 1.0.2 → 1.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    new_backup (1.0.2)
+    new_backup (1.0.3)
       RunIt
       dogapi
       fog

data/lib/new_backup/datadog.rb

@@ -47,17 +47,19 @@ module NewBackup
 
     include Methadone::CLILogging
 
-    @api_key = nil
-    @environment = (ENV['RAILS_ENV'].nil? || ENV['RAILS_ENV'].empty?) ? 'development' : ENV['RAILS_ENV']
+    DataDogger = Struct.new :api_key, :environment, :client
 
     module_function
 
     def api_key
-      @api_key
+      $dogger ||= DataDogger.new
+      $dogger.api_key
     end
     
     def api_key=(api_key)
-      @api_key=api_key
+      $dogger ||= DataDogger.new
+      $dogger.api_key=api_key
+      debug "#{self.class}##{__method__}@#{__LINE__}: $dogger.api_key: #{$dogger.api_key}"
     end
 
     def dogger(msg, options={})
@@ -69,21 +71,30 @@ module NewBackup
       else
         info msg
       end
+      debug "#{self.class}##{__method__}@#{__LINE__}: $dogger exists? #{$dogger.inspect}"
+      debug "#{self.class}##{__method__}@#{__LINE__}: $dogger.api_key: #{$dogger.api_key}"
+      return if $dogger.api_key.nil? || $dogger.api_key.empty?
       
-      return if @api_key.nil? || @api_key.empty?
-      
-      @client ||= Datadog::Client.new(@api_key)
+      $dogger.client ||= Dogapi::Client.new($dogger.api_key)
+      debug "#{self.class}##{__method__}@#{__LINE__}: $dogger.client: #{$dogger.client.inspect}"
+
+      $dogger.environment ||= (ENV['RAILS_ENV'].nil? || ENV['RAILS_ENV'].empty?) ? 'development' : ENV['RAILS_ENV']
+
+      hostname = `hostname`.chomp
 
       emit_options = {
         :msg_title => msg,
-        :alert_type => (options[:type] == :error) ? 'Error' : 'Normal',
-        :tags => [ "host:#{`hostname`}", "env:#{@environment}" ],
+        :alert_type => (options[:type] == :error) ? 'error' : 'success',
+        :tags => [ "host:#{hostname}", "env:#{$dogger.environment}", "new_backup" ],
         :priority => 'normal',
+        :host => hostname,
         :source => 'MyApps'}
 
       body = options[:body] ||= msg
 
-      @client.emit_event(Dogapi::Event.new(body, emit_options))
+      this_event = Dogapi::Event.new(body, emit_options)
+      debug "#{self.class}##{__method__}@#{__LINE__}: emit_options: #{emit_options.to_yaml}\nbody: #{body}\nthis_event: #{this_event.inspect}"
+      $dogger.client.emit_event(this_event)
 
     end
 

data/lib/new_backup/main.rb

@@ -105,6 +105,9 @@ module NewBackup
 
       debug @options.to_yaml
 
+      $dogger = DataDogger.new
+      $dogger.api_key=@options[:datadog][:api_key] unless @options[:debug]
+      debug "#{self.class}##{__method__}@#{__LINE__}: $dogger.api_key: #{$dogger.api_key}"
 
     end
 

data/lib/new_backup/version.rb

@@ -11,7 +11,7 @@
 
 
 module NewBackup
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
   DESCRIPTION = "Backup an RDS database instance to S3, and create and obfuscated version"
   SUMMARY = DESCRIPTION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: new_backup
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -205,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2444084947987149633
+      hash: -1819741959940293617
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2444084947987149633
+      hash: -1819741959940293617
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24