rest-ftp-daemon 0.305.0 → 0.306.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2802386f8b827e27d25b54c13cc87fd53eb2e1f
-  data.tar.gz: e7025e6844c9469ff02b1a1eb3c1bf204d6910c7
+  metadata.gz: 6edd22943111a9e497528ea36e6890af33f9ef47
+  data.tar.gz: caeb1289c6f8e878fe926e90d9c8b693c80f26e0
 SHA512:
-  metadata.gz: e9dff222b7810f70a7cba87452ef23e19c1d8dfac637e0dbe7ca3d6ec2a50bf7a6cabf2cd1da5f68a5de88b58b3abb694c6ff3ee79f9955f809bf5bb1d976e36
-  data.tar.gz: 9578b8b8521da9e393fed22a119caf8343bc9a9d5df56eae2e4b685a6f705b9d3033be38f340e6731e36e611c1783e5ea618cd5703a67cd5acd7c92adec28eeb
+  metadata.gz: 1c4e9793292e1bd0020fd96f9f9d0770200b04aaafe4a8630833021545baa3a4b10ca1d480c52fa5cb80bfa84a1c162f48febdf4995f0cccc2a68baebd76c440
+  data.tar.gz: f269efbb1a414c0610a2bbdbaba41b641a75e1b97e84c270c1dbb1d1590b871f828d06d538a91cdd3af6ec441a3d7c9ac68ec76485063bbb214b5b2afd3da66b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.305.0)
+    rest-ftp-daemon (0.306.0)
       api-auth
       bmc-daemon-lib (~> 0.2)
       double-bag-ftps

data/README.md

@@ -11,7 +11,7 @@ through a RESTful API. Create transfer jobs by POSTing a simple JSON structure,
 be notified of their completion, watch their status on a dedicated dashboard.
 
 
-![Dashboard](dashboard.png)
+![Dashboard](dashboard-201607.png)
 
 
 Features

data/lib/rest-ftp-daemon.rb

@@ -18,6 +18,8 @@ require_relative "shared/patch_haml"
 # Project's libs
 require_relative "rest-ftp-daemon/constants"
 require_relative "rest-ftp-daemon/exceptions"
+require_relative "rest-ftp-daemon/help_views"
+require_relative "rest-ftp-daemon/help_apis"
 require_relative "rest-ftp-daemon/helpers"
 require_relative "rest-ftp-daemon/metrics"
 require_relative "rest-ftp-daemon/paginate"

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

@@ -8,7 +8,7 @@ module RestFtpDaemon
       desc "Show daemon config"
       get "/" do
         status 200
-        return Helpers.get_censored_config
+        return get_censored_config
       end
 
       desc "Reload daemon config"
@@ -16,7 +16,7 @@ module RestFtpDaemon
         if Conf[:allow_reload]==true
           Conf.reload!
           status 200
-          return Helpers.get_censored_config
+          return get_censored_config
         else
           status 403
           return "Config reload not permitted"

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

@@ -11,11 +11,17 @@ module RestFtpDaemon
       ### HELPERS
       helpers do
         def render name, values={}
+          # Prepare template engine
           template = File.read("#{Conf.app_libs}/views/#{name}.haml")
-
           haml_engine = Haml::Engine.new(template, encoding: Encoding::UTF_8)
-              #:encoding => Encoding::ASCII_8BIT
-          haml_engine.render(binding, values)
+
+          # Inject helpers
+          scope_object = eval("self", binding)
+          scope_object.extend RestFtpDaemon::HelpViews
+          scope_object.extend RestFtpDaemon::Helpers
+
+          # Do the rendering !
+          haml_engine.render(scope_object, values)
         end
 
         def build_dashboard filter = ''

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

@@ -5,8 +5,6 @@ module RestFtpDaemon
     class Root < Grape::API
       include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
-
-
       ### LOGGING & HELPERS
       helpers do
         def log_prefix
@@ -35,6 +33,7 @@ module RestFtpDaemon
       end
 
       ### CLASS CONFIG
+      helpers RestFtpDaemon::HelpApis
       helpers BmcDaemonLib::LoggerHelper
       logger BmcDaemonLib::LoggerPool.instance.get :api
       do_not_route_head!
@@ -70,7 +69,7 @@ module RestFtpDaemon
 
       ### ENDPOINTS
       get "/" do
-        redirect Helpers.dashboard_filter_url()
+        redirect dashboard_url()
       end
 
     end

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

@@ -0,0 +1,12 @@
+module RestFtpDaemon
+  module HelpApis
+
+    def get_censored_config
+      config = Conf.to_hash
+      config[:users] = Conf[:users].keys if Conf[:users]
+      config[:endpoints] = Conf[:endpoints].keys if Conf[:endpoints]
+      config
+    end
+
+  end
+end

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

@@ -0,0 +1,74 @@
+module RestFtpDaemon
+  module HelpViews
+
+    def dashboard_job_url job
+      "#{MOUNT_JOBS}/#{job.id}" if job.respond_to? :id
+    end
+
+    def job_runs_style runs
+      return  "label-outline"   if runs <= 0
+      return  "label-info"      if runs == 1
+      return  "label-warning"   if runs == 2
+      return  "label-danger"    if runs > 2
+    end
+
+    def job_method_label method
+      return if method.nil?
+      klass = case method
+      when JOB_METHOD_FILE
+        "label-primary"
+      when JOB_METHOD_FTP
+        "label-warning"
+      when JOB_METHOD_FTPS
+        "label-success"
+      else
+        "label-default"
+      end
+      "<div class=\"transfer-method label #{klass}\">#{method.upcase}</div>"
+    end
+
+    def datetime_short datetime
+      # return param.class
+      return "-" if datetime.nil?
+      return "?" unless datetime.respond_to? :to_date
+      return datetime.to_datetime.strftime("%H:%M:%S") if datetime.to_date == Time.now.to_date
+      datetime.to_datetime.strftime("%d/%m %H:%M:%S")
+    end
+
+    def formatted_duration duration
+      out = []
+
+      hours = duration / (60 * 60)
+      minutes = (duration / 60) % 60
+      seconds = duration % 60
+
+      out << "#{hours}h" if hours > 0
+      out << "#{minutes}mn" if (minutes > 0) || (hours > 0)
+      out << "#{seconds}s"
+
+      out.join(" ")
+    end
+
+    def remove_credentials path
+      return unless path.is_a? String
+      path.sub(/([a-z]+:\/\/[^\/]+):[^\/]+\@/, '\1@')
+    end
+
+    def token_to_label name, url = ''
+      clean_url = remove_credentials url
+      sprintf '<span class="token" title="%s">%s</span>', clean_url, name
+    end
+
+    def token_highlight path
+      return unless path.is_a? String
+      path.gsub(/\[([^\[]+)\]/, token_to_label('\1'))
+    end
+
+    def text_or_empty text
+      return "-" if text.nil? || text.empty?
+      text
+    end
+
+
+  end
+end

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

@@ -1,14 +1,7 @@
 module RestFtpDaemon
-  class Helpers
+  module Helpers
 
-    def self.get_censored_config
-      config = Conf.to_hash
-      config[:users] = Conf[:users].keys if Conf[:users]
-      config[:endpoints] = Conf[:endpoints].keys if Conf[:endpoints]
-      config
-    end
-
-    def self.format_bytes number, unit="", decimals = 0
+    def format_bytes number, unit="", decimals = 0
       return "Ø" if number.nil? || number.to_f.zero?
 
       units = ["", "k", "M", "G", "T", "P" ]
@@ -20,110 +13,24 @@ module RestFtpDaemon
       "#{truncated} #{units[index]}#{unit}"
     end
 
-    def self.text_or_empty text
-      return "-" if text.nil? || text.empty?
-
-      text
-    end
-
-    def self.identifier len
+    def identifier len
       rand(36**len).to_s(36)
     end
 
-    def self.tokenize item
+    def tokenize item
       return unless item.is_a? String
       "[#{item}]"
     end
 
-    def self.highlight_tokens path
-      return unless path.is_a? String
-      path.gsub(/\[([^\[]+)\]/, '<span class="token">\1</span>')
-    end
-
-    def self.extract_filename path
-      return unless path.is_a? String
-      # match everything that's after a slash at the end of the string
-      m = path.match(/\/?([^\/]+)$/)
-      return m[1] unless m.nil?
-    end
-
-    def self.extract_dirname path
-      return unless path.is_a? String
-      # match all the beginning of the string up to the last slash
-      m = path.match(/^(.*)\/[^\/]*$/)
-      return "/#{m[1]}" unless m.nil?
-    end
-
-    def self.extract_parent path
-      return unless path.is_a? String
-      m = path.match(/^(.*)\/([^\/]+)\/?$/)
-      return m[1], m[2] unless m.nil?
-    end
-
-    def self.job_method_label method
-      return if method.nil?
-      klass = case method
-      when JOB_METHOD_FILE
-        "label-primary"
-      when JOB_METHOD_FTP
-        "label-warning"
-      when JOB_METHOD_FTPS
-        "label-success"
-      else
-        "label-default"
-      end
-      "<div class=\"transfer-method label #{klass}\">#{method.upcase}</div>"
-    end
-
-    def self.job_runs_style runs
-      return  "label-outline"     if runs <= 0
-      return  "label-info"  if runs == 1
-      return  "label-warning"  if runs == 2
-      return  "label-danger"   if runs > 2
+    def dashboard_url filter = ''
+      "#{MOUNT_BOARD}/#{filter}"
     end
 
     # Dates and times: date with time generator
-    def self.datetime_full datetime
-      return "-"  if datetime.nil?
-
-      datetime.to_datetime.strftime("%d.%m.%Y %H:%M:%S")
-    end
-
-    def self.datetime_short datetime
-      # return param.class
-      return "-" if datetime.nil?
-      return "?" unless datetime.respond_to? :to_date
-      return datetime.to_datetime.strftime("%H:%M:%S") if datetime.to_date == Time.now.to_date
-
-      datetime.to_datetime.strftime("%d/%m %H:%M:%S")
-    end
-
-    def self.hide_credentials_from_url path
-      return unless path.is_a? String
-      path.sub(/([a-z]+:\/\/[^\/]+):[^\/]+\@/, '\1@')
-    end
-
-    def self.formatted_duration duration
-    out = []
-
-    hours = duration / (60 * 60)
-    minutes = (duration / 60) % 60
-    seconds = duration % 60
-
-    out << "#{hours}h" if hours > 0
-    out << "#{minutes}mn" if (minutes > 0) || (hours > 0)
-    out << "#{seconds}s"
-
-    out.join(" ")
-    end
-
-    def self.dashboard_job_url job
-      "#{MOUNT_JOBS}/#{job.id}" if job.respond_to? :id
-    end
-
-    def self.dashboard_filter_url filter = ''
-      "#{MOUNT_BOARD}/#{filter}"
-    end
+    # def datetime_full datetime
+    #   return "-"  if datetime.nil?
+    #   datetime.to_datetime.strftime("%d.%m.%Y %H:%M:%S")
+    # end
 
   end
 end

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

@@ -5,6 +5,7 @@ module RestFtpDaemon
   class Job
     include BmcDaemonLib::LoggerHelper
     include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
+    include Helpers
 
     # Class constants
     FIELDS = [:source, :target, :label, :priority, :pool, :notify, :overwrite, :mkdir, :tempfile]
@@ -286,7 +287,7 @@ module RestFtpDaemon
       newpath = path.clone
       vectors.each do |from, to|
         next if to.to_s.blank?
-        newpath.gsub! Helpers.tokenize(from), to
+        newpath.gsub! tokenize(from), to
       end
 
       # Ensure result does not contain tokens after replacement
@@ -507,7 +508,7 @@ module RestFtpDaemon
       # Compute temp target name
       tempname = nil
       if @tempfile
-        tempname = "#{target.name}.temp-#{Helpers.identifier(JOB_TEMPFILE_LEN)}"
+        tempname = "#{target.name}.temp-#{identifier(JOB_TEMPFILE_LEN)}"
         log_debug "Job.remote_push tempname [#{tempname}]"
       end
 
@@ -515,7 +516,7 @@ module RestFtpDaemon
       if @overwrite
         @remote.remove! target
       elsif size = @remote.present?(target)
-        log_debug "Job.remote_push existing (#{Helpers.format_bytes size, 'B'})"
+        log_debug "Job.remote_push existing (#{format_bytes size, 'B'})"
         raise RestFtpDaemon::JobTargetFileExists
       end
 
@@ -564,9 +565,9 @@ module RestFtpDaemon
         # Log progress
         stack = []
         stack << "#{percent0} %"
-        stack << (Helpers.format_bytes @transfer_sent, "B")
-        stack << (Helpers.format_bytes @transfer_total, "B")
-        stack << (Helpers.format_bytes @current_bitrate.round(0), "bps")
+        stack << (format_bytes @transfer_sent, "B")
+        stack << (format_bytes @transfer_total, "B")
+        stack << (format_bytes @current_bitrate.round(0), "bps")
         stack2 = stack.map { |txt| ("%#{LOG_PIPE_LEN.to_i}s" % txt) }.join("\t")
         log_debug "progress #{stack2} \t#{name}"
 

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

@@ -4,6 +4,7 @@ module RestFtpDaemon
   class JobQueue
     include BmcDaemonLib::LoggerHelper
     include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
+    include Helpers
 
     # Class options
     attr_reader :logger
@@ -27,7 +28,7 @@ module RestFtpDaemon
 
       # Identifiers generator
       @last_id = 0
-      @prefix = Helpers.identifier JOB_IDENT_LEN
+      @prefix = identifier JOB_IDENT_LEN
       log_info "JobQueue initialized (prefix: #{@prefix})"
     end
 

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

@@ -5,6 +5,7 @@ require 'rest_client'
 module RestFtpDaemon
   class Notification
     include BmcDaemonLib::LoggerHelper
+    include Helpers
 
     # Class options
     attr_reader :logger
@@ -22,7 +23,7 @@ module RestFtpDaemon
       @params = params
 
       # Generate a random key
-      @id = Helpers.identifier(NOTIFY_IDENTIFIER_LEN)
+      @id = identifier(NOTIFY_IDENTIFIER_LEN)
       @jid = nil
 
       # Logger

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

@@ -1,5 +1,6 @@
 module RestFtpDaemon
   class Paginate
+    include Helpers
 
     # Class options
     attr_writer :filter
@@ -53,7 +54,7 @@ module RestFtpDaemon
 
     def link p
       klass = (p == @page)? "primary" : "default"
-      url = Helpers.dashboard_filter_url(@filter)
+      url = dashboard_url(@filter)
       "<a class='btn btn-%s' href='%s?page=%d'>%p</a>" % [
         klass,
         @filter,

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

@@ -45,6 +45,12 @@ module RestFtpDaemon
 
   private
 
+    def extract_parent path
+      return unless path.is_a? String
+      m = path.match(/^(.*)\/([^\/]+)\/?$/)
+      return m[1], m[2] unless m.nil?
+    end
+
     def myname
       self.class.to_s
     end

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

@@ -65,7 +65,7 @@ module RestFtpDaemon
     def chdir_or_create directory, mkdir = false
       # Init, extract my parent name and my own name
       log_debug "RemoteFTP.chdir_or_create mkdir[#{mkdir}] dir[#{directory}]"
-      parent, _current = Helpers.extract_parent(directory)
+      parent, _current = extract_parent(directory)
 
       # Access this directory
       begin

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

@@ -64,7 +64,7 @@ module RestFtpDaemon
     def chdir_or_create directory, mkdir = false
       # Init, extract my parent name and my own name
       log_debug "RemoteSFTP.chdir_or_create mkdir[#{mkdir}] dir[#{directory}]"
-      parent, _current = Helpers.extract_parent(directory)
+      parent, _current = extract_parent(directory)
 
       # Access this directory
       begin

data/lib/rest-ftp-daemon/static/css/main.css

@@ -20,6 +20,8 @@ body, table tr td, .fixed {
   margin: 0 2px;
   border: 1px solid silver;
   border-radius: 0.25em;
+  cursor: pointer;
+  cursor: hand;
   }
 
 .label {
@@ -59,7 +61,6 @@ a.class {
   text-decoration: underline;
   }
 
-
 .debug {
   border: 1px solid orange;
 }
@@ -73,6 +74,15 @@ a.class {
 }
 
 
+
+/* Table styles
+-------------------------------------------------- */
+
+table.table th {
+  text-transform: uppercase;
+  }
+
+
 /* Header styles
 -------------------------------------------------- */
 .header-indicators {

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

@@ -1,3 +1,5 @@
+- title = "#{Conf.host} [#{Conf.app_env}] #{Conf.app_name} #{Conf.app_ver}"
+
 -# coding: utf-8
 !!! 5
 %html{:lang => "en"}
@@ -6,7 +8,7 @@
     %link{ href:"/css/bootstrap.css" , rel: "stylesheet"}
     %link{ href:"/css/main.css" , rel: "stylesheet"}
     -# %link{ href:"http://fonts.googleapis.com/css?family=Inconsolata:400,700" , rel: "stylesheet"}
-    %title="#{Conf.host} [#{Conf.app_env}] #{Conf.app_name}"
+    %title= title
 
   %body
 
@@ -16,20 +18,23 @@
 
     .container-fluid
       .row
-        #box-jobs.col-md-12
+        .col-md-12
           = render :dashboard_jobs
 
       .row
-        #box-tokens.col-md-6
-          = render :dashboard_tokens, {tokens: Conf[:endpoints] || {}}
-
-        #box-workers.col-md-3
+        .col-md-5
           = render :dashboard_workers
 
-        #box-rates.col-md-3
+        .col-md-4
           = render :dashboard_counters
+
+        .col-md-3
           = render :dashboard_rates
 
+      .row
+        .col-md-12
+          = render :dashboard_tokens
+
     .footer
       .container-fluid
         = render :dashboard_footer

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

@@ -7,7 +7,7 @@
     %tr
       %th group
       %th name
-      %th.text-right value
+      %th.text-right count
 
   %tbody
 

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

@@ -5,19 +5,20 @@
 
   ©
   = "2014-#{Time.now.year}"
-  %a{href: "http://bmconseil.com"}Bruno Medici Consultant
+  %a{href: "http://bmconseil.com/?ref=rftpd-dashbaord"}Bruno Medici Consultant
 
   ·
-  %a{href: "http://github.com/bmedici/rest-ftp-daemon"} GitHub
+  %a{href: "http://github.com/bmedici/rest-ftp-daemon/"} GitHub
   ·
-  %a{href: "http://refactorcop.com/bmedici/rest-ftp-daemon"} RefactorCop
+  %a{href: "http://refactorcop.com/bmedici/rest-ftp-daemon/"} RefactorCop
 
 
 .footer-indicators.pull-right
 
-  .btn-group.btn-group-sm
-    .btn.btn-default.btn-info Host
-    .btn.btn-default= Conf.host
+  - if Conf.host
+    .btn-group.btn-group-sm
+      .btn.btn-default.btn-info Host
+      .btn.btn-default= Conf.host
 
   .btn-group.btn-group-sm
     .btn.btn-default.btn-info IP
@@ -29,4 +30,4 @@
 
   .btn-group.btn-group-sm
     .btn.btn-default.btn-info Started
-    .btn.btn-default= Helpers.datetime_short(Conf.app_started)
+    .btn.btn-default= datetime_short(Conf.app_started)

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

@@ -27,7 +27,7 @@
 
   .btn-group.btn-group-sm
     .btn.btn-default.btn-warning Mem
-    .btn.btn-default= Helpers.format_bytes(mem.bytes, "B")
+    .btn.btn-default= format_bytes(mem.bytes, "B")
 
   .btn-group.btn-group-sm
     .btn.btn-default.btn-success Processed
@@ -35,4 +35,4 @@
 
   .btn-group.btn-group-sm
     .btn.btn-default.btn-success Transferred
-    .btn.btn-default= Helpers.format_bytes(info_trans, "B", 1)
+    .btn.btn-default= format_bytes(info_trans, "B", 1)

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

@@ -5,13 +5,13 @@
 
 .btn-group.btn-group-xs.filters
   - klass = @filter.empty? ? "btn-info" : ""
-  %a.btn.btn-default{href: Helpers.dashboard_filter_url(), class: klass}
+  %a.btn.btn-default{href: dashboard_url(), class: klass}
     ALL (#{counts_all})
 
 .btn-group.btn-group-xs.filters
   - jobs_by_status.each do |status, count|
     - klass = (status.to_s == @filter) ? "btn-info" : ""
-    %a.btn.btn-default{href: Helpers.dashboard_filter_url(status), class: klass}
+    %a.btn.btn-default{href: dashboard_url(status), class: klass}
       #{status} (#{count})
 
 

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

@@ -1,18 +1,19 @@
 -# coding: utf-8
 
-- groups = {pool: "pool", targethost: "target host"}
+- groups = {pool: "pool", targethost: "target"}
 
 
 %h2 Transfer rates
 
-%table.table.table-striped.table-hover.table-condensed
 
-  - groups.each do |group_by, group_title|
-    - rates_by_status = $queue.rate_by(group_by)
+- groups.each do |group_by, group_title|
+  - rates_by_status = $queue.rate_by(group_by)
+
+  %table.table.table-striped.table-hover.table-condensed
 
     %thead
       %tr
-        %th= group_title
+        %th= "by #{group_title}"
         %th.text-right bitrate
 
     %tbody
@@ -24,9 +25,4 @@
           %td
             = group
           %td.text-right
-            = Helpers.format_bytes(rate, "bps")
-
-    %thead
-      %tr
-        %td{colspan: 3}
-          %br
+            = format_bytes(rate, "bps")

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

@@ -13,7 +13,7 @@
 
   %tr{class: trclass.to_s}
     %td
-      %a{href: Helpers.dashboard_job_url(job)}
+      %a{href: dashboard_job_url(job)}
         %b= job.id
 
     %td= job.label
@@ -21,17 +21,16 @@
     %td= job.pool
 
     %td{title: job.get_info(:source, :path)}
-      = Helpers.highlight_tokens job.source
+      = token_highlight job.source
 
     %td
-      = Helpers.job_method_label (job.get_info :target, :method)
-      =# Helpers.job_method_label job.target_method
+      = job_method_label (job.get_info :target, :method)
 
     %td{title: job.get_info(:target, :url)}
-      = Helpers.highlight_tokens job.target
+      = token_highlight job.target
 
     %td
-      = Helpers.datetime_short(job.queued_at)
+      = datetime_short(job.queued_at)
 
     %td
       %span.push-status
@@ -54,19 +53,19 @@
       - if job.status == JOB_STATUS_UPLOADING
         .progress
           .progress-bar{style:"width: #{progress}%;"}
-            = Helpers.format_bytes(job.get_info(:transfer, :sent), "B")
+            = format_bytes(job.get_info(:transfer, :sent), "B")
 
       - else
         .error{title: job.get_info(:error, :message)}
-          = Helpers.text_or_empty(job.error)
+          = text_or_empty(job.error)
 
     %td.nobr.text-right
-      = Helpers.format_bytes(job.get_info(:transfer, :total), "B")
+      = format_bytes(job.get_info(:transfer, :total), "B")
 
     %td.nobr.text-right{title: "time: #{job.exectime} s"}
       - if bitrate
         %span.push-bitrate
-          = Helpers.format_bytes(bitrate, "bps")
+          = format_bytes(bitrate, "bps")
 
     %td
       - unless job.wid.nil?
@@ -77,4 +76,4 @@
         .label.label-default.flag.worker-label= job.priority
 
     %td
-      .label.flag.worker-label{class: Helpers.job_runs_style(runs)}= runs
+      .label.flag.worker-label{class: job_runs_style(runs)}= runs

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

@@ -1,15 +1,6 @@
 -# coding: utf-8
-%h2 Endpoint tokens
-
-%table.table.table-striped.table-hover.table-condensed
+- tokens = Conf[:endpoints] || {}
 
-  %thead
-    %tr
-      %th token
-      %th value
-
-  %tbody
-    - tokens.each do |token, value|
-      %tr
-        %td= Helpers.tokenize token
-        %td= Helpers.hide_credentials_from_url value
+%h2 Endpoint tokens
+- tokens.each do |name, value|
+  = token_to_label name, value

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

@@ -4,21 +4,20 @@
   - log_error "Dashboard: invalid WorkerPool"
 - variables = $pool.worker_variables
 
-%h2 Workers
+%h2 Worker status
 
 %table.table.table-striped.table-hover.table-condensed
 
   %thead
     %tr
-      %th pool
       %th worker
+      %th pool
       %th status
       %th job
       %th.text-right seen
 
   %tbody
     - variables.each do |wid, vars|
-      -# wid = vars[:wid]
       - status = vars[:status]
       - alive = $pool.worker_alive? wid
       - trclass = WORKER_STYLES[status]
@@ -28,14 +27,14 @@
         - status = "DEAD"
 
       %tr{class: trclass.to_s}
-        %td= vars[:pool]
         %td= wid
+        %td= vars[:pool]
         %td= status
         %td= vars[:jid]
         %td.text-right
 
           - if vars[:updated_at].is_a? Time
             - no_news_for = (Time.now - vars[:updated_at]).round(0)
-            = Helpers.formatted_duration no_news_for
+            = formatted_duration no_news_for
           - else
             = "?"

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

@@ -39,10 +39,5 @@ module RestFtpDaemon
       @config["clean_#{status}"] || 0
     end
 
-    # NewRelic instrumentation
-    add_transaction_tracer :worker_init,       category: :task
-    add_transaction_tracer :worker_after,      category: :task
-    add_transaction_tracer :worker_process,    category: :task
-
   end
 end

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

@@ -66,10 +66,5 @@ module RestFtpDaemon
 
     end
 
-    # NewRelic instrumentation
-    add_transaction_tracer :worker_init,       category: :task
-    add_transaction_tracer :worker_after,      category: :task
-    add_transaction_tracer :worker_process,    category: :task
-
   end
 end

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

@@ -100,10 +100,5 @@ module RestFtpDaemon
       job.oops_after_crash ex unless job.nil?
     end
 
-    # NewRelic instrumentation
-    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.305.0"
+  spec.version                    = "0.306.0"
 
   # Project description
   spec.name                       = "rest-ftp-daemon"

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

@@ -42,7 +42,7 @@ describe "Jobs", feature: true do
 
       it "assigns a status" do
         response = JSON.parse post(MOUNT_JOBS, json: params)
-        expect(response["status"]).to match(/^(queued|failed)$/)
+        expect(response["status"]).to match(/^(queued|failed|preparing)$/)
       end
 
       it "assigns a pool" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.305.0
+  version: 0.306.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -335,6 +335,8 @@ files:
 - lib/rest-ftp-daemon/constants.rb
 - lib/rest-ftp-daemon/counters.rb
 - lib/rest-ftp-daemon/exceptions.rb
+- lib/rest-ftp-daemon/help_apis.rb
+- lib/rest-ftp-daemon/help_views.rb
 - lib/rest-ftp-daemon/helpers.rb
 - lib/rest-ftp-daemon/job.rb
 - lib/rest-ftp-daemon/job_queue.rb