rest-ftp-daemon 0.434.0 → 0.435.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 591f494a7bf660ee944096abcb623bc0d771157a
-  data.tar.gz: 34f150dc4b22573c0cbc948788adee9618f82599
+  metadata.gz: 7c055c5d41a1ed721a1a3ff65bb7b27b9c3aee74
+  data.tar.gz: 84ef017d71bbf52321f3956a0303a5ccee879a80
 SHA512:
-  metadata.gz: 087935f7b3179f7033f233e3344d98e26e6ad00e8e192722991409cc2d86f320857d7a87272d70812c6a34144e4f9b668b36b2a16f624fb2c00011478d7f914f
-  data.tar.gz: 58807f103079e56eb17b679b6d5d29552aea8d30d417c7b9b2dc0a46237b23bf1b4c9d3191a5a906a872ab36798ad698f6d1d2259f5031d15363eecc3ac3cd90
+  metadata.gz: ee3b4ab65e21ca786a9d41766c71a783216765ad8651d579e6c1c46763432977a349516df998d5e448358737401f481f13fdfe41c31f54a62bbbedcde1a38acc
+  data.tar.gz: cd89a20b329a1172279ef5873489dfdf86dd23f4b25a39b4840ea4b52a5b08bc2a016aaced357eb2281e8e71ef7f1fed5bacb2fbbc1055b1ae07528f3784b0bf

data/.gitignore

@@ -7,3 +7,4 @@ log/
 DOC/
 rest-ftp-daemon.yml
 .ruby-version
+/.idea

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.434.0)
+    rest-ftp-daemon (0.435.0)
       activesupport (~> 4.2)
       api-auth
       aws-sdk-resources (~> 2)
-      bmc-daemon-lib (~> 0.3.18)
+      bmc-daemon-lib (~> 0.4.1)
       double-bag-ftps
       facter
       get_process_mem
@@ -37,16 +37,16 @@ GEM
     addressable (2.4.0)
     api-auth (2.0.1)
     ast (2.3.0)
-    aws-sdk-core (2.6.1)
+    aws-sdk-core (2.6.2)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.1)
-      aws-sdk-core (= 2.6.1)
+    aws-sdk-resources (2.6.2)
+      aws-sdk-core (= 2.6.2)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    bmc-daemon-lib (0.3.18)
-      chamber (~> 2.9)
+    bmc-daemon-lib (0.4.1)
+      chamber (~> 2.9.1)
     builder (3.2.2)
     chamber (2.9.1)
       hashie (~> 3.3)
@@ -119,7 +119,7 @@ GEM
     net-ssh (3.2.0)
     netrc (0.11.0)
     newrelic_rpm (3.16.2.321)
-    parser (2.3.1.3)
+    parser (2.3.1.4)
       ast (~> 2.2)
     powerpack (0.1.1)
     pry (0.10.4)
@@ -130,7 +130,7 @@ GEM
     rack-accept (0.4.5)
       rack (>= 0.4)
     rainbow (2.1.0)
-    rake (11.2.2)
+    rake (11.3.0)
     representable (3.0.0)
       declarative (~> 0.0.5)
       uber (~> 0.0.15)
@@ -138,7 +138,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rollbar (2.13.0)
+    rollbar (2.13.1)
       multi_json
     rspec (3.5.0)
       rspec-core (~> 3.5.0)

data/lib/rest-ftp-daemon/api/config.rb

@@ -4,6 +4,14 @@ module RestFtpDaemon
   module API
     class Config < Grape::API
 
+      ### HELPERS
+      helpers do
+        def log_context
+          {caller: "API::Config"}
+        end
+      end
+
+
       ### ENDPOINTS
       desc "Show daemon config"
       get "/" do

data/lib/rest-ftp-daemon/api/dashboard.rb

@@ -6,11 +6,15 @@ require "grape"
 
 module RestFtpDaemon
   module API
-    class Dashbaord < Grape::API
+    class Dashboard < Grape::API
       include BmcDaemonLib
 
       ### HELPERS
       helpers do
+        def log_context
+          {caller: "API::Dashboard"}
+        end
+
         def render name, values={}
           # Prepare template engine
           template = File.read("#{Conf.app_libs}/views/#{name}.haml")

data/lib/rest-ftp-daemon/api/debug.rb

@@ -7,6 +7,9 @@ module RestFtpDaemon
 
       ### HELPERS
       helpers do
+        def log_context
+          {caller: "API::Debug"}
+        end
 
         def debug_metrics
           Metrics.sample

data/lib/rest-ftp-daemon/api/jobs.rb

@@ -5,6 +5,13 @@ module RestFtpDaemon
     class Jobs < Grape::API
       include BmcDaemonLib
 
+      ### HELPERS
+      helpers do
+        def log_context
+          {caller: "API::Jobs"}
+        end
+      end
+
       ### EXCEPTIONS HANDLERS
       rescue_from RestFtpDaemon::JobNotFound do |exception|
         exception_error :api_job_not_found, 404, exception

data/lib/rest-ftp-daemon/api/root.rb

@@ -7,16 +7,22 @@ module RestFtpDaemon
   module API
     class Root < Grape::API
       include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
-      include BmcDaemonLib
+      #include BmcDaemonLib
+      include BmcDaemonLib::LoggerHelper
+
 
       ### LOGGING & HELPERS
+      logger  BmcDaemonLib::LoggerPool.instance.get :api
       helpers RestFtpDaemon::CommonHelpers
       helpers RestFtpDaemon::ApiHelpers
       helpers BmcDaemonLib::LoggerHelper
 
       helpers do
-        def log_prefix
-          ['API', nil, nil]
+
+        include BmcDaemonLib::LoggerHelper
+
+        def log_context
+          {caller: "API::Root"}
         end
 
         def logger
@@ -28,7 +34,7 @@ module RestFtpDaemon
           lines = exception.message.lines.collect(&:strip).reject(&:empty?)
 
           # Log error to file
-          log_error "#{http_code} [#{error}] #{lines.shift} ", lines
+          log_error "[#{error}] [#{http_code}] #{lines.shift} ", lines
 
           # Return error
           error!({
@@ -48,14 +54,14 @@ module RestFtpDaemon
 
       ## EXCEPTION HANDLERS
       rescue_from :all do |exception|
-        Rollbar.error exception, "api [#{error}]: #{exception.class.name}: #{exception.message}"
+        Rollbar.error exception, "api: #{exception.class.name}: #{exception.message}"
+        # Rollbar.error exception, "api [#{error}]: #{exception.class.name}: #{exception.message}"
         #error!({error: :internal_server_error, message: exception.message}, 500)
-        exception_error :api_unexpected_error, 500, exception
+        exception_error :api_error, 500, exception
       end
 
 
       ### CLASS CONFIG
-      logger BmcDaemonLib::LoggerPool.instance.get :api
       do_not_route_head!
       do_not_route_options!
       # version 'v1'
@@ -66,20 +72,15 @@ module RestFtpDaemon
       default_format :json
 
       # Pretty JSON
-      formatter :json_tmp, ->(object, env) do
-        put "----- formatter"
-        puts object.inspect
-        # JSON.pretty_generate(JSON.parse(object.to_json))
-        #if object.respond_to? to_hash
-          JSON.pretty_generate(object)
-        #end
-        put "-----"
-      end
+      # formatter :json_tmp, ->(object, env) do
+      #   puts object.inspect
+      #   JSON.pretty_generate(object)
+      # end
 
       ### MOUNTPOINTS
       mount RestFtpDaemon::API::Status      => MOUNT_STATUS
       mount RestFtpDaemon::API::Jobs        => MOUNT_JOBS
-      mount RestFtpDaemon::API::Dashbaord   => MOUNT_BOARD
+      mount RestFtpDaemon::API::Dashboard   => MOUNT_BOARD
       mount RestFtpDaemon::API::Config      => MOUNT_CONFIG
       mount RestFtpDaemon::API::Debug       => MOUNT_DEBUG
 

data/lib/rest-ftp-daemon/api/status.rb

@@ -6,6 +6,13 @@ module RestFtpDaemon
     class Status < Grape::API
       include BmcDaemonLib
 
+      ### HELPERS
+      helpers do
+        def log_context
+          {caller: "API::Status"}
+        end
+      end
+
       ### ENDPOINTS
       desc "Show daemon status"
       get "/" do

data/lib/rest-ftp-daemon/constants.rb

@@ -16,8 +16,6 @@ JOB_FFMPEG_ATTRIBUTES   = [:video_codec, :video_bitrate, :video_bitrate_toleranc
 
 # Internal job infos
 INFO_PARAMS               = :params
-
-
 INFO_ERROR_MESSAGE        = :error_message
 INFO_ERROR_EXCEPTION      = :error_exception
 INFO_ERROR_BACKTRACE      = :error_backtrace
@@ -31,22 +29,17 @@ INFO_TRANFER_PROGRESS     = :progress
 INFO_TRANFER_BITRATE      = :bitrate
 INFO_TARGET_FILES         = :target_files
 
-
 # Constants: logger
-LOG_FORMAT_PROGNAME      = "%d\t%s"
-LOG_HEADER_TIME          = "%Y-%m-%d %H:%M:%S"
-LOG_HEADER_FORMAT        = "%s \t%d\t%-8s %-10s "
-LOG_MESSAGE_TRIM         = 200
-LOG_MESSAGE_TEXT         = "%s%s"
-LOG_MESSAGE_ARRAY        = "%s     - %s"
-LOG_MESSAGE_HASH         = "%s     * %-20s %s"
-
-
-# Constants: logger app-specific prefix
-LOG_PREFIX_WID           = 8
-LOG_PREFIX_JID           = JOB_IDENT_LEN + 4
-LOG_PREFIX_ID            = 5
-LOG_PREFIX_FORMAT        = "%#{-LOG_PREFIX_WID.to_i}s %#{-LOG_PREFIX_JID.to_i}s %#{-LOG_PREFIX_ID.to_i}s "
+LOGGER_FORMAT = {
+  # context:  "%#{-LOG_PREFIX_WID.to_i}s %#{-LOG_PREFIX_JID.to_i}s %#{-LOG_PREFIX_ID.to_i}s ",
+  # context:  "wid:%-8{wid} jid:%-12{jid} id:%-5{id}",
+  context: {
+    caller: "%-17s",
+    wid:    "%-10s",
+    jid:    "%-10s",
+    id:     "%-8s",
+    }
+  }
 
 
 # Constants: logger to be cleaned up

data/lib/rest-ftp-daemon/job.rb

@@ -7,12 +7,11 @@ require "securerandom"
 
 module RestFtpDaemon
   class Job
+    include BmcDaemonLib::LoggerHelper
     include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
     include CommonHelpers
 
     # Logging
-    attr_reader :logger
-    include BmcDaemonLib::LoggerHelper
 
     # Fields to be imported from params
     IMPORTED = %w(type priority pool label priority source target overwrite notify mkdir tempfile video_options video_custom)
@@ -59,18 +58,16 @@ module RestFtpDaemon
       @status       = nil
       @tentatives   = 0
       @wid          = nil
-
-      # Update timestamps
       @created_at   = Time.now
 
+      # Logger # FIXME: should be :jobs
+      log_pipe      :transfer
+
       # Prepare configuration
       @config       = Conf[:transfer] || {}
       @endpoints    = Conf[:endpoints] || {}
       @pools        = Conf[:pools] || {}
 
-      # Logger
-      @logger   = BmcDaemonLib::LoggerPool.instance.get :transfer
-
       # Import query params
       set_info INFO_PARAMS, params
       IMPORTED.each do |field|
@@ -83,11 +80,16 @@ module RestFtpDaemon
       # Prepare sources/target
       raise RestFtpDaemon::JobAttributeMissing, "source" unless params[:source]
       @source_loc = Location.new(params[:source])
-      log_info "Job.initialize source #{@source_loc.uri}"
 
       raise RestFtpDaemon::JobAttributeMissing, "target" unless params[:target]
       @target_loc = Location.new(params[:target])
-      log_info "Job.initialize target #{@target_loc.uri}"
+
+      # We're done!
+      log_info "Job.initialized", {
+        source: @source_loc.uri,
+        target: @target_loc.uri,
+        pool: @pool,
+        }
     end
 
     def reset
@@ -220,8 +222,12 @@ module RestFtpDaemon
 
   private
 
-    def log_prefix
-     [@wid, @id, nil]
+    def log_context
+      {
+      wid: @wid,
+      jid: @id,
+      #id: @id,
+      }
     end
 
     def touch_job
@@ -309,7 +315,7 @@ module RestFtpDaemon
       end
 
       # Log to Rollbar
-      Rollbar.warning e, "oops [#{error}]: #{exception.class.name}: #{exception.message}"
+      Rollbar.warning exception, "oops [#{error}]: #{exception.class.name}: #{exception.message}"
 
       # Close ftp connexion if open
       @remote.close unless @remote.nil? || !@remote.connected?

data/lib/rest-ftp-daemon/job_queue.rb

@@ -4,13 +4,11 @@ require 'singleton'
 module RestFtpDaemon
   class JobQueue
     include Singleton
-
     include BmcDaemonLib::LoggerHelper
     include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
     include CommonHelpers
 
     # Class options
-    attr_reader :logger
     attr_reader :jobs
 
     def initialize
@@ -28,10 +26,10 @@ module RestFtpDaemon
       @mutex = Mutex.new
 
       # Logger
-      @logger = BmcDaemonLib::LoggerPool.instance.get :queue
+      log_pipe :queue
 
       # Identifiers generator
-      @prefix = identifier JOB_IDENT_LEN
+      @prefix = identifier(JOB_IDENT_LEN)
       log_info "JobQueue initialized (prefix: #{@prefix})"
     end
 
@@ -259,10 +257,6 @@ module RestFtpDaemon
 
   protected
 
-    def log_prefix
-     [nil, nil, nil]
-    end
-
     def prefixed_id id
       "#{@prefix}.#{id}"
     end

data/lib/rest-ftp-daemon/jobs/transfer.rb

@@ -22,16 +22,16 @@ module RestFtpDaemon
       case target_uri
       when URI::FTP
         log_info "JobTransfer.do_before target_method FTP"
-        @remote = Remote::RemoteFTP.new @target_loc, log_prefix, @config[:debug_ftp]
+        @remote = Remote::RemoteFTP.new @target_loc, log_context, @config[:debug_ftp]
       when URI::FTPES, URI::FTPS
         log_info "JobTransfer.do_before target_method FTPES/FTPS"
-        @remote = Remote::RemoteFTP.new @target_loc, log_prefix, @config[:debug_ftps], :ftpes
+        @remote = Remote::RemoteFTP.new @target_loc, log_context, @config[:debug_ftps], :ftpes
       when URI::SFTP
         log_info "JobTransfer.do_before target_method SFTP"
-        @remote = Remote::RemoteSFTP.new @target_loc, log_prefix, @config[:debug_sftp]
+        @remote = Remote::RemoteSFTP.new @target_loc, log_context, @config[:debug_sftp]
       when URI::S3
         log_info "JobTransfer.do_before target_method S3"
-        @remote = Remote::RemoteS3.new @target_loc, log_prefix, @config[:debug_s3]
+        @remote = Remote::RemoteS3.new @target_loc, log_context, @config[:debug_s3]
       else
         message = "unknown scheme [#{@target_loc.scheme}] [#{target_uri.class.name}]"
         log_info "JobTransfer.do_before #{message}"

data/lib/rest-ftp-daemon/location.rb

@@ -18,10 +18,6 @@ module RestFtpDaemon
     attr_reader :aws_id
     attr_reader :aws_secret
 
-    # Logging
-    #attr_reader :logger
-    #include BmcDaemonLib::LoggerHelper
-
     # def_delegators :@uri,
     delegate :scheme, :host, :port, :user, :password, :to_s,
       to: :uri

data/lib/rest-ftp-daemon/notification.rb

@@ -8,7 +8,6 @@ module RestFtpDaemon
     include CommonHelpers
 
     # Class options
-    attr_reader :logger
     attr_accessor :job_id
     attr_accessor :signal
     attr_accessor :error
@@ -27,7 +26,7 @@ module RestFtpDaemon
       @jid = nil
 
       # Logger
-      @logger = BmcDaemonLib::LoggerPool.instance.get :notify
+      log_pipe :notify
 
       # Handle the notification
       log_info "initialized [#{@url}]"
@@ -104,8 +103,11 @@ module RestFtpDaemon
         log_error "UNHANDLED EXCEPTION: #{e.message}", e.backtrace
     end
 
-    def log_prefix
-     [nil, @jid, @id]
+    def log_context
+      {
+      jid: @jid,
+      id: @id,
+      }
     end
 
   end

data/lib/rest-ftp-daemon/remote/base.rb

@@ -5,14 +5,13 @@ module RestFtpDaemon
       include BmcDaemonLib::LoggerHelper
 
       # Class options
-      attr_reader :logger
       attr_reader :log_prefix
       attr_accessor :job
 
       # Delegate set_info info to Job
       delegate :set_info, to: :job
 
-      def initialize target, log_prefix, debug = false, ftpes = false
+      def initialize target, context, debug = false, ftpes = false
         # Init
         @target = target
         @ftpes = ftpes
@@ -22,8 +21,8 @@ module RestFtpDaemon
         @job = Job.new(nil, {})
 
         # Logger
-        @log_prefix = log_prefix || {}
-        @logger = BmcDaemonLib::LoggerPool.instance.get :transfer
+        @context = context || {}
+        log_pipe :transfer
 
         # Annnounce object
         log_info "RemoteBase.initialize debug[#{debug}] target[#{target.path}] "
@@ -61,6 +60,12 @@ module RestFtpDaemon
         puts "-------------------- SESSION CLOSING --------------------------"
       end
 
+    protected
+
+      def log_context
+        @context
+      end
+
     private
 
       def split_path path

data/lib/rest-ftp-daemon/views/dashboard_footer.haml

@@ -5,7 +5,7 @@
 
   ©
   = "2014-#{Time.now.year}"
-  %a{href: "http://bmconseil.com/?ref=rftpd-dashbaord", target: TARGET_BLANK} Bruno Medici Consultant
+  %a{href: "http://bmconseil.com/?ref=rftpd-dashboard", target: TARGET_BLANK} Bruno Medici Consultant
 
   ·
   %a{href: "http://github.com/bmedici/rest-ftp-daemon/", target: TARGET_BLANK} GitHub

data/lib/rest-ftp-daemon/worker_pool.rb

@@ -4,17 +4,15 @@ require 'singleton'
 module RestFtpDaemon
   class WorkerPool
     include Singleton
-
     include BmcDaemonLib::LoggerHelper
     include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
     # Class options
-    attr_reader :logger
     attr_reader :wid
 
     def initialize
       # Logger
-      @logger = BmcDaemonLib::LoggerPool.instance.get :workers
+      log_pipe :workers
 
       # Prepare status hash and vars
       @statuses = {}
@@ -65,12 +63,6 @@ module RestFtpDaemon
       @workers[wid] && @workers[wid].alive?
     end
 
-  protected
-
-    def log_prefix
-     [nil, nil, nil]
-    end
-
   private
 
     def thread_variables thread

data/lib/rest-ftp-daemon/workers/conchita.rb

@@ -10,6 +10,7 @@ module RestFtpDaemon
       config_section :conchita
 
       # Check that everything is OK
+      return "conchita disabled" if disabled?(@config[:timer])
       return "invalid timer" unless @config[:timer].to_i > 0
       return false
     end

data/lib/rest-ftp-daemon/workers/reporter.rb

@@ -13,6 +13,7 @@ module RestFtpDaemon
       @feature_newrelic = Conf.feature?(:newrelic)
 
       # Check that everything is OK
+      return "reporter disabled"  if disabled?(@config[:timer])
       return "invalid timer"      unless @config[:timer].to_i > 0
       return false
     end

data/lib/rest-ftp-daemon/workers/transfer.rb

@@ -11,6 +11,7 @@ module RestFtpDaemon
       @endpoints        = Conf[:endpoints]
 
       # Timeout and retry config
+      return "timeout disabled"  if disabled?(@config[:timeout])
       return "invalid timeout" unless @config[:timeout].to_i > 0
 
       # Log that
@@ -24,7 +25,7 @@ module RestFtpDaemon
 
     def worker_after
       # Clean worker status
-      worker_jid nil
+      worker_set_jid nil
     end
 
   private
@@ -35,23 +36,24 @@ module RestFtpDaemon
       job = RestFtpDaemon::JobQueue.instance.pop @pool
 
       # Work on this job
-      work_on_job job
+      job_process job
 
       # Clean job status
       job.wid = nil
       #sleep 1
 
       # Handle the retry if needed
-      handle_job_result job
+      job_result job
     end
 
-    def work_on_job job
+    def job_process job
       # Prepare job and worker for processing
-      worker_jid job.id
+      worker_set_jid job.id
       worker_status WORKER_STATUS_RUNNING, job
       job.wid = Thread.current.thread_variable_get :wid
 
       # Processs this job protected by a timeout
+      log_info "job_process: start working"
       Timeout.timeout(@config[:timeout], RestFtpDaemon::JobTimeout) do
         job.start
       end
@@ -60,45 +62,45 @@ module RestFtpDaemon
       RestFtpDaemon::Counters.instance.increment :jobs, :processed
 
     rescue RestFtpDaemon::JobTimeout => ex
-      log_error "JOB TIMEOUT started_at[#{job.started_at}] started_since[#{job.started_since}] #{ex.message}", ex.backtrace
+      log_error "job_process: TIMEOUT: started_at[#{job.started_at}] started_since[#{job.started_since}] #{ex.message}", ex.backtrace
       worker_status WORKER_STATUS_TIMEOUT, job
 
       # Inform the job
       job.oops_end(:timeout, ex) unless job.nil?
 
     rescue RestFtpDaemon::AssertionFailed, RestFtpDaemon::JobAttributeMissing, StandardError => ex
-      log_error "JOB CRASHED ex[#{ex.class}] #{ex.message}", ex.backtrace
+      log_error "job_process: CRASHED: ex[#{ex.class}] #{ex.message}", ex.backtrace
       worker_status WORKER_STATUS_CRASHED
 
       # Inform the job
       job.oops_end(:crashed, ex) unless job.nil?
     end
 
-    def handle_job_result job
+    def job_result job
       # If job status requires a retry, just restack it
       if !job.error
         # Processing successful
-        log_error "job finished with no error"
+        log_info "job_result: finished with success"
         worker_status WORKER_STATUS_FINISHED, job
 
       elsif error_not_eligible(job)
-        log_error "not retrying [#{job.error}] retry_on not eligible"
+        log_error "job_result: not retrying [#{job.error}] retry_on not eligible"
 
       elsif error_reached_for(job)
-        log_error "not retrying [#{job.error}] retry_for reached [#{@config[:retry_for]}s]"
+        log_error "job_result: not retrying [#{job.error}] retry_for reached [#{@config[:retry_for]}s]"
 
       elsif error_reached_max(job)
-        log_error "not retrying [#{job.error}] retry_max reached #{tentatives(job)}"
+        log_error "job_result: not retrying [#{job.error}] retry_max reached #{tentatives(job)}"
 
       else
         # Delay cannot be negative, and will be 1s minimum
         retry_after = [@config[:retry_after] || DEFAULT_RETRY_AFTER, 1].max
-        log_info "retry job [#{job.id}] in [#{retry_after}s] tried #{tentatives(job)}"
+        log_info "job_result: retrying job [#{job.id}] in [#{retry_after}s] - tried #{tentatives(job)}"
 
         # Wait !
         worker_status WORKER_STATUS_RETRYING, job
         sleep retry_after
-        log_debug "job [#{job.id}] requeued after [#{retry_after}s] delay"
+        log_debug "job_result: job [#{job.id}] requeued after [#{retry_after}s] delay"
 
         # Now, requeue this job
         RestFtpDaemon::JobQueue.instance.requeue job
@@ -129,6 +131,11 @@ module RestFtpDaemon
       return job.tentatives >= @config[:retry_max]
     end
 
+    def worker_set_jid jid
+      Thread.current.thread_variable_set :jid, jid
+      Thread.current.thread_variable_set :updated_at, Time.now
+    end
+
     def tentatives job
       "[#{job.tentatives}/#{@config[:retry_max]}]"
     end

data/lib/rest-ftp-daemon/workers/worker.rb

@@ -8,5 +8,19 @@ module RestFtpDaemon
     add_transaction_tracer :worker_init,       category: :task
     add_transaction_tracer :worker_after,      category: :task
     add_transaction_tracer :worker_process,    category: :task
+
+  protected
+
+    def log_context
+      {
+      wid: Thread.current.thread_variable_get(:wid),
+      jid: Thread.current.thread_variable_get(:jid),
+      }
+    end
+
+    def disabled? value
+      value.nil? || value === false || value == 0
+    end
+
   end
 end

data/rest-ftp-daemon.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   # Project version
-  spec.version                    = "0.434.0"
+  spec.version                    = "0.435.0"
 
   # Project description
   spec.name                       = "rest-ftp-daemon"
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "ruby-prof"
 
   # Runtime dependencies
-  spec.add_runtime_dependency     "bmc-daemon-lib", "~> 0.3.18"
+  spec.add_runtime_dependency     "bmc-daemon-lib", "~> 0.4.1"
   spec.add_runtime_dependency     "json", "~> 1.8"
   spec.add_runtime_dependency     "thin", "~> 1.7"
   spec.add_runtime_dependency     "activesupport", "~> 4.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.434.0
+  version: 0.435.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.18
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.18
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement