cantemo-portal-agent 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b3f1ea75c5103dd91d6b863538cb5bd4b6ff7c2
-  data.tar.gz: '0796314e40e182e785a2d8cc8290be0e0a653545'
+  metadata.gz: 941c3be4e0b16164d64637173764d3fcaacc01f1
+  data.tar.gz: 1531dde6210f28ce51e5c7bdd514c85d03910f3b
 SHA512:
-  metadata.gz: a57aeb7f14fceb67dfbbbfe091593c49ef57491fb5968b3f4b46e9a3beccff7964153a8b06d88e13268b10de315102db28a147647a5c9455090c4a7fe46af748
-  data.tar.gz: 68487f27150376d370b6254df75a339b49385d3957eb490e90e79bc9c3054dc7b77d8e5fe50dae5ad0ee42c9eea71d5fee803306e7378338c18bb6ae00e18083
+  metadata.gz: 114af11cb4e03732296cd5d5c39727042bedc457440d7cbd89b5842233004da96c0442a97df73cc8fed297745b3ea2a1a87f9a67539a2ebab7c18c2038cdadbd
+  data.tar.gz: ff6261efd8fc22cc8019b7bee7a36fba60f61d22d87202604f39d9dc39a610feb0965500dd5ba5f338ca3f6469651f98373c786ba0278e4e8ef720e1f545c679

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

@@ -52,12 +52,18 @@ if sub_command == 'help'
   exit
 end
 
+
 config_file_path = args[:config_file_path]
 if config_file_path.is_a?(Array)
   args[:config_file_path].map! { |v| File.expand_path(v) }
   config_file_path = config_file_path.find { |file_path| File.exist?(file_path) }
+else
+  args[:config_file_path] = config_file_path = File.expand_path(config_file_path)
 end
 
+unless config_file_path && File.exist?(config_file_path)
+  abort("Configuration file not found. Path(s): #{args[:config_file_path]}")
+end
 
 # daemon_control_command_present = sub_command && begin
 #   sub_command = sub_command.dup.downcase if sub_command
@@ -79,25 +85,10 @@ end
 module Application
 
   module OS
-    def OS.windows?
-      (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
-    end
-
-    def OS.mac?
-      (/darwin/ =~ RUBY_PLATFORM) != nil
-    end
-
-    def OS.unix?
-      !OS.windows?
-    end
-
-    def OS.linux?
-      OS.unix? and not OS.mac?
-    end
-  end
-
-  class ProcessManager
-
+    def OS.windows?;  (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil end
+    def OS.mac?;      (/darwin/ =~ RUBY_PLATFORM) != nil end
+    def OS.unix?;     !OS.windows? end
+    def OS.linux?;    OS.unix? and not OS.mac? end
   end
 
   if OS.windows?
@@ -109,7 +100,8 @@ module Application
       end
 
       def service_main(*args)
-        @WatchFolderManager = WATCH_FOLDER_MANAGER_CLASS.run(args)
+        @WatchFolderManager = WATCH_FOLDER_MANAGER_CLASS.new(args)
+        @WatchFolderManager.run
       end
 
       def service_stop
@@ -117,11 +109,11 @@ module Application
       end
 
       def service_pause
-
+        @WatchFolderManager.pause
       end
 
       def service_resume
-
+        @WatchFolderManager.resume
       end
 
       # Watcher - Windows
@@ -176,7 +168,6 @@ module Application
 
       def self.run_with_process_manager(args, options = {})
         # ARGV.unshift 'run' unless %w(start stop restart run zap killall status).include? ARGV.first
-        self.run(args)
         require 'daemons'
         proc     = Proc.new { self.run(args) }
         app_name = APP_NAME
@@ -200,18 +191,26 @@ module Application
 
   end
 
-  def run_in_foreground(args)
+  def self.run_in_foreground(args)
     Watcher.run(args)
   end
 
-  def run(args)
+  def self.run_with_process_manager(args)
+    Watcher.run_with_process_manager(args)
+  end
+
+  def self.run(args)
 
   end
 
 end
 
+# puts "ARGV: #{ARGV}"
+# exit
+
 if !Application::OS.windows?
   begin
+    ARGV.unshift sub_command unless ARGV.first == sub_command
     Application.run_with_process_manager(args)
     exit
   rescue => e
@@ -219,6 +218,18 @@ if !Application::OS.windows?
   end
 end
 
+
+module Application
+
+  class WindowsDaemon
+
+  end
+
+  class WindowsService
+
+  end
+
+end
 # Options:
 #    install    - Installs the service.
 #    start      - Starts the service.
@@ -239,11 +250,12 @@ EXECUTABLE_NAME = __FILE__
 
 # You must provide at least one argument.
 abort('No argument provided.') unless sub_command
-abort('Service not installed.') unless Service.exists?(SERVICE_NAME) && sub_command == 'install'
+abort('Service not installed.') unless Service.exists?(SERVICE_NAME) || sub_command == 'install'
 
 
 case sub_command
 when 'runasservice'
+  Application::Watcher.mainloop(args)
 when 'start'
   if Service.status(SERVICE_NAME).current_state != 'running'
     Service.start(SERVICE_NAME, nil)

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

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

data/lib/envoi/mam/agent/daemon/service_wrapper.rb

@@ -0,0 +1,19 @@
+module Envoi
+
+  module Mam
+
+    class Agent
+
+      class Daemon
+
+        class ServiceWrapper
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/envoi/watch_folder_utility/watch_folder.rb

@@ -344,125 +344,6 @@ module Envoi
         handler.stable_files
       end
 
-      def process_stable_files
-        active_processors         = @processors_by_watch_folder[wf]
-        maximum_active_processors = definition['maximum_active_processors']
-
-        includes = definition['includes']
-        excludes = definition['excludes']
-
-        unless ignored_file_paths
-          ignored_file_paths = @ignored_file_paths_by_watch_folder[wf]
-        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
-
-          if includes && !includes.empty?
-            should_include = find_in_patterns(includes, file)
-            unless should_include
-              add_to_ignore(file)
-              next
-            end
-          end
-
-          should_exclude = find_in_patterns(excludes, file)
-          if should_exclude
-            add_to_ignore(file)
-            next
-          end
-
-          if @threaded
-            active_processors.keep_if { |k, v| k.processing }
-            if active_processors.length >= maximum_active_processors
-              logger.debug { "Maximum number of active processors reached for watch folder. #{wf.name || wf.paths}" }
-              break
-            end
-            t = Thread.new(file) do |file|
-              wf = file.watch_folder
-              begin
-                process_file(file)
-              rescue => e
-                logger.error { "Exception '#{e.message}' in thread for `#{wf.name || wf.paths}` `#{file.path}`. " }
-                raise e
-              ensure
-                file.processing = false rescue nil
-              end
-            end
-            t.join
-            active_processors[file] = t if file.processing
-          else
-            process_file(file)
-          end
-
-        end
-      end
-
-      # @param [Object] file
-      # @return [Hash]
-      def process_file(file)
-        file.processing = true
-        file_name       = file.name || file.path
-        logger.debug { "Processing File '#{file_name}'" }
-
-        storage_id                = watch_folder.definition['upload_to_storage_id']
-
-        unless storage_id
-          logger.warn { "Skipping processing of file because of missing storage ID." }
-          return { success: false, message: 'Missing storage ID.' }
-        end
-
-        quarantine_directory_path = definition['quarantine_directory_path']
-        completed_directory_path  = definition['completed_directory_path']
-        watch_folder_upload_args  = definition['upload_args']
-
-        # full_file_path = File.join(watch_folder.path, file.path)
-        full_file_path = file.path
-
-        upload_args = {
-            file_path: full_file_path,
-            storage_id: storage_id
-        }
-        upload_args.merge!(watch_folder_upload_args) if watch_folder_upload_args.is_a?(Hash)
-
-        logger.debug { "Executing Upload. #{upload_args}" }
-        _response = agent.upload(upload_args)
-        _response = { success: _response } if _response == true || _response == false
-
-        if _response[:success]
-          if completed_directory_path
-            if Dir.exist?(completed_directory_path)
-              logger.debug { "Moving '#{full_file_path}' to completed directory path '#{completed_directory_path}'" }
-              FileUtils.mv full_file_path, completed_directory_path
-            else
-              logger.warn { "Completed directory path not found: '#{completed_directory_path}'" }
-              add_to_ignore(file)
-            end
-          else
-            FileUtils.rm full_file_path
-          end
-        else
-          if quarantine_directory_path && Dir.exist?(quarantine_directory_path)
-            logger.warn { "Moving '#{full_file_path}' to quarantine directory path '#{quarantine_directory_path}'" }
-            FileUtils.mv full_file_path, quarantine_directory_path
-          else
-            logger.warn { "Adding '#{full_file_path}' to the temporary ignore list." }
-            add_to_ignore(file)
-          end
-        end
-
-        file.processed = true
-
-        _response
-      rescue => e
-        file.exception = e
-        raise e
-      ensure
-        file.processing = false
-      end
-
       # Converts hash keys to symbols
       #
       # @param [Hash] value hash

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cantemo-portal-agent
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - John Whitson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asperalm
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 1.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 1.6.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +158,7 @@ files:
 - lib/envoi/mam/agent/client/mediasilo.rb
 - lib/envoi/mam/agent/client/vidispine.rb
 - lib/envoi/mam/agent/config_service_client.rb
+- lib/envoi/mam/agent/daemon/service_wrapper.rb
 - lib/envoi/mam/agent/generic.rb
 - lib/envoi/mam/agent/notifier.rb
 - lib/envoi/mam/agent/notifier/sns.rb