ec2launcher 1.0.23 → 1.0.24

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.24
+
+* Fixed typos.
+* Hide additional logging.
+
 ## 1.0.23
 
 * Display subnet CIDR block when launching instances into VPCs.

data/lib/ec2launcher/block_device_builder.rb

@@ -2,6 +2,9 @@
 # Copyright (c) 2012 Sean Laurent
 #
 require 'ec2launcher/defaults'
+require 'log4r'
+
+include Log4r
 
 module EC2Launcher
   # Helper class to build EC2 block device definitions.
@@ -20,6 +23,8 @@ module EC2Launcher
 
       @block_device_mappings = {}
       @block_device_tags = {}
+
+      @log = Logger['ec2launcher']
     end
 
     # Generates the mappings for ephemeral and ebs volumes.
@@ -147,7 +152,7 @@ module EC2Launcher
     def clone_volumes(block_device_mappings, application, clone_host = nil)
       return if clone_host.nil?
 
-      puts "Retrieving snapshots..."
+      @log.info "Retrieving snapshots..."
       AWS.start_memoizing
       base_device_name = "sdf"
       application.block_devices.each do |block_device|
@@ -183,10 +188,10 @@ module EC2Launcher
     # @return [Hash<Integer, AWS::EC2::Snapshot>] mapping of RAID device numbers (zero based) to AWS Snapshots.
     #
     def get_latest_raid_snapshot_mapping(hostname, purpose, count)
-      puts "Retrieving list of snapshots ..."
+      @log.info "Retrieving list of snapshots ..."
       result = @ec2.snapshots.tagged("host").tagged_values(hostname).tagged("volumeName").tagged_values("*raid*").tagged("time")
 
-      puts "Building list of snapshots to clone (#{purpose}) for '#{hostname}'..."
+      @log.info "Building list of snapshots to clone (#{purpose}) for '#{hostname}'..."
       snapshot_name_regex = /#{purpose} raid.*/
       host_snapshots = []
       result.each do |s|
@@ -242,7 +247,7 @@ module EC2Launcher
       end
       most_recent_dates.sort!
 
-      puts "Most recent snapshot: #{most_recent_dates[0]}"
+      @log.info "Most recent snapshot: #{most_recent_dates[0]}"
 
       snapshot_mapping = { }
       AWS.memoize do
@@ -271,7 +276,7 @@ module EC2Launcher
     # @return [AWS::EC2::Snapshot, nil] matching snapshot or nil if no matching snapshot
     #
     def get_latest_snapshot_by_purpose(clone_host, purpose)
-      puts "  Retrieving snapshtos for #{clone_host} [#{purpose}]"
+      @log.info "Retrieving snapshtos for #{clone_host} [#{purpose}]"
       results = @ec2.snapshots.tagged("host").tagged_values(clone_host).tagged("purpose").tagged_values(purpose)
       
       snapshot = nil

data/lib/ec2launcher/version.rb

@@ -2,5 +2,5 @@
 # Copyright (c) 2012 Sean Laurent
 #
 module EC2Launcher
-  VERSION = "1.0.23"
+  VERSION = "1.0.24"
 end

data/lib/ec2launcher.rb

@@ -39,7 +39,7 @@ module EC2Launcher
       @run_url_script_cache = nil
       @setup_script_cache = nil
 
-      @log = Logger.new 'mylog'
+      @log = Logger.new 'ec2launcher'
       log_output = Outputter.stdout
       log_output.formatter = PatternFormatter.new :pattern => "%m"
       @log.outputters = log_output
@@ -330,7 +330,7 @@ module EC2Launcher
       @log.info "Gems                : #{gems.join(', ')}"
       @log.info "Packages            : #{packages.join(', ')}"
       if subnet
-        cidr_block = ec2.subnets[subnet].cidr_block
+        cidr_block = @ec2.subnets[subnet].cidr_block
         @log.info "VPC Subnet          : #{subnet} (#{cidr_block})"
       end
       @log.info ""
@@ -383,10 +383,10 @@ module EC2Launcher
 
         public_dns_name = instance.public_dns_name.nil? ? "no public dns" : instance.public_dns_name
         private_dns_name = instance.private_dns_name.nil? ? "no private dns" : instance.private_dns_name
-        @log.warn "Launched #{fqdn_names[i]} (#{instance.id}) [#{public_dns_name} / #{private_dns_name} / #{instance.private_ip_address} ]"
+        @log.info "Launched #{fqdn_names[i]} (#{instance.id}) [#{public_dns_name} / #{private_dns_name} / #{instance.private_ip_address} ]"
       end
 
-      @log.warn "********************"    
+      @log.info "********************"    
       fqdn_names.each_index do |i|
         public_dns_name = instances[i].public_dns_name.nil? ? "n/a" : instances[i].public_dns_name
         private_dns_name = instances[i].private_dns_name.nil? ? "n/a" : instances[i].private_dns_name
@@ -403,7 +403,7 @@ module EC2Launcher
       ##############################
       # COMPLETED
       ##############################
-      @log.warn "********************"    
+      @log.info "********************"    
     end
 
     # Attaches an instance to the specified ELB.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.0.23
+  version: 1.0.24
   prerelease: 
 platform: ruby
 authors: