omf_common 6.1.2 → 6.1.3.pre.1

data/lib/omf_common.rb

@@ -249,30 +249,7 @@ module OmfCommon
   #
   def self._init_logging(opts = {})
     logger = Logging.logger.root
-    if appenders = opts[:appenders]
-      logger.clear_appenders
-      appenders.each do |type, topts|
-        case type.to_sym
-        when :stdout
-          $stdout.sync = true
-          logger.add_appenders(
-            Logging.appenders.stdout('custom',
-              :layout => Logging.layouts.pattern(topts)
-          ))
 
-        when :file
-          dir_name = topts.delete(:log_dir) || DEF_LOG_DIR
-          file_name = topts.delete(:log_file) || "#{File.basename($0, File.extname($0))}.log"
-          path = File.join(dir_name, file_name)
-          logger.add_appenders(
-            Logging.appenders.file(path,
-              :layout => Logging.layouts.pattern(topts)
-          ))
-        else
-          raise "Unknown logging appender type '#{type}'"
-        end
-      end
-    end
     if level = opts[:level]
       if level.is_a? Hash
         # package level settings
@@ -287,6 +264,33 @@ module OmfCommon
         logger.level = level.to_sym
       end
     end
+
+    if appenders = opts[:appenders]
+      logger.clear_appenders
+      appenders.each do |type, topts|
+        pattern_opts = {
+          pattern:  topts.delete(:pattern),
+          date_pattern: topts.delete(:date_pattern),
+          color_scheme: topts.delete(:color_scheme),
+          date_method: topts.delete(:date_method)
+        }
+
+        appender_opts = topts.merge(layout: Logging.layouts.pattern(pattern_opts))
+
+        case type.to_sym
+        when :stdout
+          $stdout.sync = true
+          logger.add_appenders(Logging.appenders.stdout('custom_stdout', appender_opts))
+        when :file, :rolling_file
+          dir_name = topts.delete(:log_dir) || DEF_LOG_DIR
+          file_name = topts.delete(:log_file) || "#{File.basename($0, File.extname($0))}.log"
+          path = File.join(dir_name, file_name)
+          logger.add_appenders(Logging.appenders.send(type, path, appender_opts))
+        else
+          raise "Unknown logging appender type '#{type}'"
+        end
+      end
+    end
   end
 
   def self._rec_merge(this_hash, other_hash)

data/lib/omf_common/comm/amqp/amqp_communicator.rb

@@ -127,14 +127,17 @@ module OmfCommon
           begin
             last_reported_timestamp = nil
             @session = ::AMQP.connect(@url, @opts) do |connection|
-              connection.on_tcp_connection_loss do |conn, settings|
-                now = Time.now
-                if last_reported_timestamp == nil || (now - last_reported_timestamp) > 60
-                  warn "Lost connectivity. Trying to reconnect..."
-                  last_reported_timestamp = now
-                end
-                _reconnect(conn)
+              connection.on_connection_interruption do |conn|
+                warn "Conn detected connection interruption"
               end
+              #connection.on_tcp_connection_loss do |conn, settings|
+              #  now = Time.now
+              #  if last_reported_timestamp == nil || (now - last_reported_timestamp) > 60
+              #    warn "Lost connectivity. Trying to reconnect..."
+              #    last_reported_timestamp = now
+              #  end
+              #  _reconnect(conn)
+              #end
               @channel  = ::AMQP::Channel.new(connection)
               @channel.auto_recovery = true
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: omf_common
 version: !ruby/object:Gem::Version
-  version: 6.1.2
-  prerelease: 
+  version: 6.1.3.pre.1
+  prerelease: 6
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -346,12 +346,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 2193462712645432448
+      version: 1.3.1
 requirements: []
 rubyforge_project: omf_common
 rubygems_version: 1.8.23