ec2launcher 1.7.4 → 1.7.5

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.7.5
+
+* Fixed stray reference to Log4r.
+
+## 1.7.4
+
+* Clean up bad references to Log4r.
+
 ## 1.7.3
 
 * Fixed issue with Gemspec not installing executables correctly.

data/lib/ec2launcher/terminator.rb

@@ -15,10 +15,16 @@ module EC2Launcher
     include BackoffRunner
 
     def initialize(config_directory)
-      @log = Logger.new 'ec2launcher'
-      log_output = Outputter.stdout
-      log_output.formatter = PatternFormatter.new :pattern => "%m"
-      @log.outputters = log_output
+      begin
+        @log = Log4r::Logger['ec2launcher']
+        unless @log
+          @log = Log4r::Logger.new 'ec2launcher'
+          log_output = Log4r::Outputter.stdout
+          log_output.formatter = PatternFormatter.new :pattern => "%m"
+          @log.outputters = log_output
+        end
+      rescue
+      end
 
       ##############################
       # Load configuration data

data/lib/ec2launcher/version.rb

@@ -2,5 +2,5 @@
 # Copyright (c) 2013 Sean Laurent
 #
 module EC2Launcher
-  VERSION = "1.7.4"
+  VERSION = "1.7.5"
 end

metadata

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