rest-ftp-daemon 0.300.3 → 0.302.0

data/lib/{rest-ftp-daemon/worker.rb → shared/worker_base.rb}

@@ -1,32 +1,45 @@
-module RestFtpDaemon
-  class Worker
+module Shared
+  class WorkerBase
     include Shared::LoggerHelper
     attr_reader :logger
+    attr_reader :pool
+    attr_reader :wid
 
     def initialize wid, pool = nil
       # Logger
       @logger = RestFtpDaemon::LoggerPool.instance.get :workers
       @log_worker_status_changes = true
 
-      # Worker name
-      @pool = pool
+      # Configuration
+      @config = {}
 
       # Set thread context
+      @pool = pool
+      @wid = wid
       Thread.current.thread_variable_set :pool, pool
       Thread.current.thread_variable_set :wid, wid
       Thread.current.thread_variable_set :started_at, Time.now
       worker_status WORKER_STATUS_STARTING
 
-      # Load corker conf
-      load_config wid
-    end
+      # Ask worker to init itself, and return if there are errors
+      if worker_init_result = worker_init
+        log_error "worker_init aborting: #{worker_init_result.inspect}", @config
+      else
+        # We're ok, let's start out loop
+        start_loop
+      end
+  end
 
   protected
 
-    def wait_according_to_config
-      # Sleep for a few seconds
-      worker_status WORKER_STATUS_WAITING
-      sleep @config[:timer] if @config.is_a? Hash
+    # Worker methods prototypes
+    def worker_init
+    end
+    def worker_after
+    end
+    def worker_process
+    end
+    def worker_config
     end
 
     def log_prefix
@@ -37,13 +50,16 @@ module RestFtpDaemon
       ]
     end
 
-    def work
-    end
-
-    def start
+    def start_loop
+      log_info "start_loop starting", @config
       loop do
         begin
-          work
+          # Do the hard work
+          worker_process
+
+          # Do the cleaning/sleeping stuff
+          worker_after
+
         rescue StandardError => e
           log_error "WORKER EXCEPTION: #{e.inspect}"
           sleep 1
@@ -72,26 +88,24 @@ module RestFtpDaemon
       Thread.current.thread_variable_set :updated_at, Time.now
     end
 
-  private
-
-    def load_config wid
-      # My debug
-      @debug = (Conf.at :debug, wid) == true
+    def config_section key
+      # Debugging
       @log_worker_status_changes = @debug
 
-      # My configuration
-      @config = Conf[wid]
-      if !@config.is_a? Hash
-        return log_info "#{self.class.name}: missing #{wid}/* configuration"
-      elsif @config[:timer].nil?
-        return log_info "#{self.class.name}: missing #{wid}/timer value"
+      # Set my configuration
+      if (Conf[key].is_a? Hash) && Conf[key]
+        @config = Conf[key]
+      else
+        log_error "missing [#{key}] configuration"
       end
     end
 
     # NewRelic instrumentation
     if Conf.newrelic_enabled?
       include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
-      add_transaction_tracer :work,       category: :task
+      add_transaction_tracer :worker_init,       category: :task
+      add_transaction_tracer :worker_after,      category: :task
+      add_transaction_tracer :worker_process,    category: :task
     end
 
   end

data/rest-ftp-daemon.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   # Project version
-  spec.version      = "0.300.3"
+  spec.version      = "0.302.0"
 
   # Project description
   spec.name                   = "rest-ftp-daemon"
@@ -14,18 +14,18 @@ Gem::Specification.new do |spec|
   spec.licenses               = ["MIT"]
   spec.date                   = Time.now.strftime("%Y-%m-%d")
 
+
   # List files and executables
   spec.files                  = `git ls-files -z`.split("\x0").reject{ |f| f == "dashboard.png"}
   spec.executables            = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths          = ["lib"]
-  spec.required_ruby_version  = ">= 2.2"
+  spec.required_ruby_version  = ">= 2.2.3"
 
 
   # Development dependencies
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "http"
   spec.add_development_dependency "rubocop", "~> 0.32.0"
   spec.add_development_dependency "pry"
 
@@ -35,6 +35,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "grape-entity"
   spec.add_runtime_dependency "settingslogic"
   spec.add_runtime_dependency "chamber"
+  spec.add_runtime_dependency "rest-client", "~> 1.8"
+  spec.add_runtime_dependency "api-auth"
   spec.add_runtime_dependency "haml"
   spec.add_runtime_dependency "json"
   spec.add_runtime_dependency "net-sftp"

data/spec/rest-ftp-daemon/features/dashboard_spec.rb

@@ -3,11 +3,11 @@ require "spec_helper"
 describe "Dashboard", feature: true do
 
   describe "GET #{MOUNT_BOARD}" do
-    context 'without a password' do
-      it 'is forbidden' do
-        expect(HTTP.accept(:json).get("http://localhost:#{RequestHelpers::PORT}").status).to eq 401
-      end
-    end
+    # context 'without a password' do
+    #   it 'is forbidden' do
+    #     expect(HTTP.accept(:json).get("http://localhost:#{RequestHelpers::PORT}").status).to eq 401
+    #   end
+    # end
 
     context "with a password" do
       it "can be accessed" do

data/spec/spec_helper.rb

@@ -53,8 +53,8 @@ RSpec.configure do |config|
 
   include RequestHelpers
 
-  def call_server command, config = Pathname(__dir__).join("support/config.yml"), port = RequestHelpers::PORT
-    system(Pathname(__dir__).join("../bin/rest-ftp-daemon -e test -c #{config} #{command} -p #{port}").to_s, chdir: __dir__) || fail("Could not #{command} server")
+  def call_server command, port = RequestHelpers::PORT
+    system(Pathname(__dir__).join("../bin/rest-ftp-daemon -e test -p #{port} #{command}").to_s, chdir: __dir__) || fail("Could not #{command} server")
   end
 
   config.before :suite do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.300.3
+  version: 0.302.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: http
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +150,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: api-auth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -333,22 +347,20 @@ files:
 - lib/rest-ftp-daemon/views/dashboard_table.haml
 - lib/rest-ftp-daemon/views/dashboard_tokens.haml
 - lib/rest-ftp-daemon/views/dashboard_workers.haml
-- lib/rest-ftp-daemon/worker.rb
-- lib/rest-ftp-daemon/worker_conchita.rb
-- lib/rest-ftp-daemon/worker_job.rb
 - lib/rest-ftp-daemon/worker_pool.rb
-- lib/rest-ftp-daemon/worker_reporter.rb
+- lib/rest-ftp-daemon/workers/conchita.rb
+- lib/rest-ftp-daemon/workers/reporter.rb
+- lib/rest-ftp-daemon/workers/transfer.rb
 - lib/shared/conf.rb
 - lib/shared/logger_formatter.rb
 - lib/shared/logger_helper.rb
+- lib/shared/worker_base.rb
 - rest-ftp-daemon.gemspec
-- rest-ftp-daemon.sample.yml
 - spec/rest-ftp-daemon/features/dashboard_spec.rb
 - spec/rest-ftp-daemon/features/debug_spec.rb
 - spec/rest-ftp-daemon/features/jobs_spec.rb
 - spec/rest-ftp-daemon/features/status_spec.rb
 - spec/spec_helper.rb
-- spec/support/config.yml
 - spec/support/request_helpers.rb
 homepage: http://github.com/bmedici/rest-ftp-daemon
 licenses:
@@ -362,7 +374,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: 2.2.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -370,7 +382,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: RESTful FTP client daemon

data/rest-ftp-daemon.sample.yml

@@ -1,71 +0,0 @@
-defaults: &defaults
-  daemonize: true
-  port: 3000
-  user: rftpd
-  group: rftpd
-  # host: "myhost"
-  # pidfile: "/tmp/rftpd.pid"
-
-  pools:
-    default: 2
-
-  transfer:
-    # notify_after_sec: 5       # wait at least X seconds between HTTP notifications
-    # mkdir: true               # build directory tree if missing
-    # tempfile: true            # transfer to temporary file, rename after sucessful transfer
-    # overwrite: false          # overwrite any target file with the same name
-    # timeout: 1800             # jobs running for longer than X seconds will be killed
-
-  retry:
-    # on_errors:
-    #   - ftp_perm_error
-    #   - net_temp_error
-    #   - conn_reset_by_peer
-    #   - conn_timed_out
-    #   - conn_refused
-    #   - sftp_auth_failed
-    #   - conn_host_is_down
-    #   - conn_unreachable
-    #   - conn_failed
-    #   - conn_openssl_error
-    # max_runs: 5
-    # max_age: 1800
-    # delay: 10
-
-  conchita:
-    # timer: 60
-    # garbage_collector: true
-    # clean_failed: 3600
-    # clean_finished: 3600
-    # clean_queued: 86400
-
-  newrelic:
-    licence: ""
-    # prefix: "rftpd"                       # app prefix
-    platform: "bigbusiness"               # app platform name
-    # app_name: "rftpd-bigbusiness-dev"     # nickname used for naming app
-
-  debug:
-    ftp: false
-    sftp: false
-    conchita: false
-    reporter: fakse
-    allow_reload: false
-
-  logs:
-    thin:    "/var/log/rftpd-environment-thin.log"
-    queue:   "/var/log/rftpd-environment-core.log"
-    api:     "/var/log/rftpd-environment-core.log"
-    workers: "/var/log/rftpd-environment-work.log"
-    jobs:    "/var/log/rftpd-environment-work.log"
-    notify:  "/var/log/rftpd-environment-work.log"
-    newrelic:"/var/log/rftpd-environment-newrelic.log"
-
-
-development:
-  <<: *defaults
-  port: 3400
-
-production:
-  <<: *defaults
-  port: 3200

data/spec/support/config.yml

@@ -1,25 +0,0 @@
-test:
-  daemonize: true
-  port: 5678
-  workers: 2
-  adminpwd: "admin"
-  host: local
-
-  transfer:
-    notify_after_sec: 5
-    mkdir: true
-    tempfile: true
-    overwrite: false
-    timeout: 1800
-
-  debug:
-    ftp: false
-
-  logs:
-    thin:     "/tmp/rftpd-tests-thin.log"
-    queue:    "/tmp/rftpd-tests-core.log"
-    api:      "/tmp/rftpd-tests-core.log"
-    workers:  "/tmp/rftpd-tests-work.log"
-    jobs:     "/tmp/rftpd-tests-work.log"
-    notify:   "/tmp/rftpd-tests-work.log"
-    newrelic: "/tmp/rftpd-tests-newrelic.log"