cantemo-portal-agent 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0df20d26170e018fbb101b896771dda9a848a8a
-  data.tar.gz: 977b72cf9a04ce9c70b31dc03436a57c78a5675a
+  metadata.gz: 6f0d27e760275d391be6c1ddcf25ef719b0dfc3c
+  data.tar.gz: 48467f20279721c70111f4cb9f5df80434449e64
 SHA512:
-  metadata.gz: 5173fe6dbe088d8ab5195c59c3666887d957cd2876e86c65463dd3da4386594973252ddb93fc714ef6831c0685cda06db0cbd8413424e9e46b8c6646b233938f
-  data.tar.gz: 4ad8f5e06305f2cd174c3bcb6a86c7959414ba257dcd59580cfd32dd9fe7ef072aedef4033f840e732987237738e8a4616f9b0586b57d8266cdaf7c8c4fffd4a
+  metadata.gz: 2f5839f0f15c28da04609aa8e8b4c699b252a0fc16915cc68c935a2fa801b01fd1ff99089ff6bf1320e6236747a159d380c55df35fd84d8ac40f2d1df29b1592
+  data.tar.gz: a27477de9b6679772c3b45bec647a45588d4567765b628180bdf4897c4534df99da9ef4ca9a089885fd101e7b1b7aac03c5e48508ac88d9c3f1fdbbbef713439

data/lib/cantemo/portal/agent/cli/commands/watch_folders.rb

@@ -80,5 +80,5 @@ class Watcher < Envoi::Mam::Cantemo::Agent::WatchFolderManager; end
 begin
   Watcher.run_with_process_manager(args)
 rescue => e
-  abort("An error occurred. #{e.message}\n#{e.backtrace}")
+  abort("An error occurred. #{e.message}")
 end

data/lib/cantemo/portal/agent/version.rb

@@ -1,7 +1,7 @@
 module Cantemo
   module Portal
     class Agent
-      VERSION = '1.2.5'.freeze
+      VERSION = '1.2.6'.freeze
     end
   end
 end

data/lib/cantemo/portal/api/client.rb

@@ -17,6 +17,10 @@ module Cantemo
           api_base_path          = args[:api_base_path]
           api_default_query_data = args[:default_query_data]
 
+          api_log_level = args[:log_level]
+          api_log_to = args[:log_to]
+          api_logger = args[:logger]
+
           api_url = args[:url] || args[:uri]
           if api_url
             api_uri      = URI(api_url)
@@ -50,6 +54,9 @@ module Cantemo
           client_args[:default_query_data]         = api_default_query_data if api_default_query_data
           client_args[:api_endpoint_prefix]        = api_endpoint_prefix
           client_args[:api_noauth_endpoint_prefix] = api_noauth_endpoint_prefix
+          client_args[:log_level]                  = api_log_level if api_log_level
+          client_args[:log_to]                     = api_log_to if api_log_to
+          client_args[:logger]                     = api_logger if api_logger
 
           if api_auth_token
             # Cantemo Portal supports an auth token for authentication, replace basic auth with auth-token

data/lib/envoi/mam/cantemo/agent.rb

@@ -44,6 +44,7 @@ module Envoi
           api_config  = agent_config
           @api_client = args[:api_client] || begin
             client_args = Hash[api_config.map { |k,v| [ k.respond_to?(:to_sym) ? k.to_sym.downcase : k, v ]}]
+            client_args[:logger] = logger
             _client = ::Cantemo::Portal::API::Client.new(client_args)
 
             begin

data/lib/envoi/mam/cantemo/agent/watch_folder_manager.rb

@@ -43,6 +43,7 @@ module Envoi::Mam::Cantemo
 
         @config = Envoi::Mam::Cantemo::Agent.load_config_from_file(args)
         initialize_logger_from_config
+        args[:logger] = @logger
 
         cantemo_config = config[:cantemo] || config['cantemo']
 
@@ -75,10 +76,9 @@ module Envoi::Mam::Cantemo
 
       def initialize_logger(args = {})
         @logger   = args[:logger] ||= Logger.new(args[:log_to] || STDOUT)
-        log_level = args[:log_level] = Logger::INFO
+        log_level = args[:log_level] ||= Logger::INFO
         if log_level
           @logger.level = log_level
-          args[:logger] = @logger
         end
         @logger
       end
@@ -89,7 +89,7 @@ module Envoi::Mam::Cantemo
         logger_args[:log_to] = log_to if log_to
         log_level = _config['log_level']
         if log_level
-          _log_level = ['fatal', 'error', 'warn', 'info', 'debug'].find(log_level.downcase)
+          _log_level = ['fatal', 'error', 'warn', 'info', 'debug'].find { |v| v = log_level.downcase }
           logger_args[:log_level] = _log_level.upcase if _log_level
         end
         initialize_logger(logger_args) unless logger_args.empty?
@@ -240,6 +240,7 @@ module Envoi::Mam::Cantemo
         end
 
         stable_files.each do |file|
+          file.watch_folder ||= wf
           next if file.respond_to?(:ignore?) ? file.ignore? : ignored_file_paths.include?(file.path)
           next if file.processing || file.processed
 
@@ -268,6 +269,7 @@ module Envoi::Mam::Cantemo
               begin
                 process_file(file)
               rescue => e
+                logger.error { "Exception '#{e.message}' in thread for `` `#{file.path}`. " }
                 logger.error { "Exception '#{e.message}' in thread for `#{wf.name || wf.paths}` `#{file.path}`. " }
                 raise e
               ensure

data/lib/envoi/watch_folder_utility/watch_folder.rb

@@ -49,7 +49,7 @@ module Envoi
 
       def initialize_logger(args = {})
         @logger   = args[:logger] ||= Logger.new(args[:log_to] || STDOUT)
-        log_level = args[:log_level] = Logger::INFO
+        log_level = args[:log_level] ||= Logger::INFO
         if log_level
           @logger.level = log_level
           args[:logger] = @logger
@@ -248,7 +248,7 @@ module Envoi
               _add_item_to_collection = true
               watch_folder_def.delete('collection_name')
             else
-              file_path_collection_name_position = import_args[:file_path_collection_name_position]
+              file_path_collection_name_position = watch_folder_def['file_path_collection_name_position']
               if file_path_collection_name_position
                 import_args[:file_path_collection_name_position] = file_path_collection_name_position
                 _add_item_to_collection = true
@@ -294,7 +294,6 @@ module Envoi
         watch_folder_def['upload_args'] = upload_args
         logger.debug { "Parameter 'upload/import arguments' initialized." }
 
-
         maximum_active_processors = watch_folder_def['maximum_active_processors']
         if maximum_active_processors.nil?
           maximum_active_processors = @default_maximum_active_processors

data/lib/envoi/watch_folder_utility/watch_folder/handler/listen.rb

@@ -24,11 +24,11 @@ module Envoi
           class DiscoveredPath < OpenStruct
 
             def min_stable_time
-              self[:monitor].min_stable_time
+              handler.min_stable_time
             end
 
             def min_stable_poll_count
-              self[:monitor].min_stable_poll_count
+              handler.min_stable_poll_count
             end
 
             def stable?
@@ -53,24 +53,32 @@ module Envoi
 
             def summary
               _table = @table.dup
-              _table.delete(:monitor)
+              _table.delete(:handler)
               _table
             end
 
             def watch_folder
-              self[:monitor]
+              self[:watch_folder]
             end
 
             def watch_folder=(wf)
-              self[:monitor] = wf
+              self[:watch_folder] = wf
+            end
+
+            def handler
+              self[:handler]
+            end
+
+            def handler=(_handler)
+              self[:handler] = _handler
             end
 
             def ignore
-              self[:monitor].add_to_ignore(self)
+              handler.add_to_ignore(self)
             end
 
             def ignore?
-              self[:monitor].ignored_files_map[self[:path]] == self
+              handler.ignored_files_map[self[:path]] == self
             end
 
           end
@@ -137,7 +145,7 @@ module Envoi
             return path.each { |path| process_add_or_modified_path(path, event_type) } if path.is_a?(Array)
             logger.debug { "PATH #{event_type} '#{path}'" }
             # lock.synchronize { known_path_map[path] = OpenStruct.new({ type: event_type, path: path, stable_poll_count: 0, timestamp: Time.now}) }
-            file = known_path_map[path] ||= DiscoveredPath.new({ path: path, processed: false, monitor: self })
+            file = known_path_map[path] ||= DiscoveredPath.new({ path: path, processed: false, handler: self })
             file.event_type = event_type
             file.event_timestamp = Time.now
             file.stable_poll_count = 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cantemo-portal-agent
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - John Whitson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asperalm
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement