rest-ftp-daemon 0.240.2 → 0.241

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01c63d539e5f607adb376390b85cb2a9a9a43b8f
-  data.tar.gz: 643d5714d2347e85de8d097dc10d17df9939b9fc
+  metadata.gz: 17f4eefbc675627b89a5d71dc78253b53077d0b9
+  data.tar.gz: b5df884a47a2204cc87a9ceb05ba4bfccb35a44b
 SHA512:
-  metadata.gz: 19cf92b19a08f61c88a3d09bb8262dbc7506c609567cc1bcc9cff2908d28b97eb1c0f1e6299a8a713c099c127dd69d4fced5a7d82fdb5a0ded174838af8aeef4
-  data.tar.gz: a462495c65b96be3d3798734a7bb6bd4413f81a110868318e671b0531485964fd4231177bbbca3ac94f6524d007ad2077f3238bab2639015f50812d933c85d3d
+  metadata.gz: 54ae88ce58e703b530929940f11b87dfa30468727fcc156ae62ac88499f10d5a62ad2c3874a9b85b220ade47ee4a0d3ef4030fc4fd85a06394fd69ce3414315e
+  data.tar.gz: 74df9fd3193fe8326af484e2e4a839c63fed6ae64d8c1a4e0ec456ebba65999446424c455544365a2013af4ccecf484667cd6a6764d2b58136edb9f009909b73

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.240.2)
+    rest-ftp-daemon (0.241)
       double-bag-ftps
       facter
       get_process_mem
@@ -66,7 +66,7 @@ GEM
     haml (4.0.7)
       tilt
     hashie (3.4.2)
-    http (0.9.4)
+    http (0.9.7)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 1.0.1)
@@ -79,13 +79,13 @@ GEM
     ice_nine (0.11.1)
     json (1.8.3)
     method_source (0.8.2)
-    minitest (5.8.0)
+    minitest (5.8.1)
     multi_json (1.11.2)
     multi_xml (0.5.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
-    newrelic_rpm (3.13.0.299)
+    newrelic_rpm (3.13.1.300)
     parser (2.2.2.6)
       ast (>= 1.1, < 3.0)
     powerpack (0.1.1)
@@ -122,11 +122,11 @@ GEM
     ruby-progressbar (1.7.5)
     settingslogic (2.0.9)
     slop (3.6.0)
-    sys-cpu (0.7.1)
-      ffi (>= 1.0.0)
-    thin (1.6.3)
+    sys-cpu (0.7.2)
+      ffi
+    thin (1.6.4)
       daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
+      eventmachine (~> 1.0, >= 1.0.4)
       rack (~> 1.0)
     thread_safe (0.3.5)
     tilt (2.0.1)

data/bin/rest-ftp-daemon

@@ -92,13 +92,11 @@ end
 
 
 # ARGV: build final
-thin_logs = Settings.at(:logs, :thin)
 argv = []
 argv << ["-e", Settings.namespace]
 argv << ["-p", Settings.port.to_s] if Settings.port
 argv << ["--pid", Settings.pidfile]
 argv << ["--tag", "'#{APP_NAME}/#{Settings.namespace}'"]
-argv << ["--log", thin_logs] unless !thin_logs
 argv << ["--daemonize"] if [1, true].include? Settings.daemonize
 
 
@@ -122,7 +120,8 @@ puts "Host         \t #{Settings.host}"
 puts "Namespace    \t #{Settings.namespace}"
 puts "Network port \t #{Settings.port}"
 puts "User:group   \t #{Settings.user}:#{Settings.group}" if (Settings.user || Settings.group)
-puts "Newrelic     \t #{Settings.newrelic_enabled? ? Settings.at(:debug, :newrelic) : "no"}"
+puts "Newrelic     \t #{Settings.newrelic_enabled? ? Settings.at(:newrelic, :licence) : "no"}"
+puts "Started at   \t #{APP_STARTED.to_s}"
 # puts Settings.dump
 puts
 puts "--- Thin ARGV"
@@ -140,6 +139,8 @@ rescue Thin::PidFileExist
   puts "FAILED: daemon was already running (Thin::PidFileExist)"
 rescue Thin::PidFileNotFound
   puts "FAILED: daemon was not running (Thin::PidFileNotFound)"
+rescue Errno::ENOENT => e
+  puts "FAILED: daemon cannot access files: #{e.message}"
 rescue SystemExit
   # Leave some time for the daemon to launch
   pidfile = Settings.pidfile

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

@@ -10,26 +10,26 @@ module RestFtpDaemon
 ####### HELPERS
 
       helpers do
-
         def logger
           Root.logger
         end
-
         def render name, values={}
           template = File.read("#{APP_LIBS}/views/#{name}.haml")
           haml_engine = Haml::Engine.new(template)
           haml_engine.render(binding, values)
         end
-
       end
 
 
-####### DASHBOARD - GET /
+####### Common request logging
+    before do
+      log_info "HTTP #{request.request_method} #{request.fullpath}", params
+    end
 
-      # Server global status
-      get "/" do
-        log_info "GET /"
 
+####### DASHBOARD
+
+      get "/" do
         # Initialize Facter
         Facter.loadfacts
 

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

@@ -7,22 +7,25 @@ module RestFtpDaemon
 ####### HELPERS
 
       helpers do
-
         def logger
           Root.logger
         end
-
       end
 
 
-####### GET /jobs/:id
+####### Common request logging
+    before do
+      log_info "HTTP #{request.request_method} #{request.fullpath}", params
+    end
+
+
+####### READ ONE JOB
 
+      desc "Read job with ID"
       params do
         requires :id, type: String, desc: "ID of the Job to read", regexp: /[^\/]+/
       end
       get "/*id" do
-        log_info "GET /jobs/#{params[:id]}"
-
         begin
           # Get job to display
           raise RestFtpDaemon::JobNotFound if params[:id].nil?
@@ -45,13 +48,10 @@ module RestFtpDaemon
       end
 
 
-####### GET /jobs/
+####### READ ALL JOBS
 
       desc "List all Jobs"
-
       get "/" do
-        log_info "GET /jobs"
-
         begin
           # Get jobs to display
           jobs = $queue.jobs
@@ -68,10 +68,9 @@ module RestFtpDaemon
       end
 
 
-####### POST /jobs/
+####### CREATE A JOB
 
       desc "Create a new job"
-
       params do
         requires :source, type: String, desc: "Source file pattern"
         requires :target, type: String, desc: "Target remote path"
@@ -91,13 +90,9 @@ module RestFtpDaemon
           desc: "Upload to a temp file before renaming it to the target filename",
           default: Settings.at(:transfer, :tempfile)
       end
-
       post "/" do
-        log_info "POST /jobs", params
-        log_debug params.to_json
-
+        # log_debug params.to_json
         begin
-
           # Create a new job
           job_id = $queue.generate_id
           job = Job.new(job_id, params)

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

@@ -36,31 +36,32 @@ module RestFtpDaemon
 ####### HELPERS
 
       helpers do
-
         def logger
           Root.logger
         end
-
       end
 
 
-####### GET /routes
+####### Common request logging
+    before do
+      log_info "HTTP #{request.request_method} #{request.fullpath}", params
+    end
+
+
+####### SHOW ROUTES
 
-      desc "show application routes"
+      desc "Show application routes"
       get "/routes" do
-        log_info "GET /routes"
         status 200
         return RestFtpDaemon::API::Root.routes
       end
 
 
-####### GET /status
+####### SHOW STATUS
 
-      # Server global status
+      desc "Show daemon status"
       get "/status" do
-        log_info "GET /status"
         mem = GetProcessMem.new
-
         status 200
         return  {
           hostname: `hostname`.to_s.chomp,
@@ -78,20 +79,19 @@ module RestFtpDaemon
       end
 
 
-####### GET /config
+####### SHOW CONFIG
 
-      # Server config
+      desc "Show daemon config"
       get "/config" do
-        log_info "GET /config"
-
         status 200
         return Helpers.get_censored_config
       end
 
-      # Server config
-      post "/config/reload" do
-        log_info "POST /config/reload"
 
+####### RELOAD CONFIG
+
+      desc "Reload daemon config"
+      post "/config/reload" do
         if Settings.at(:debug, :allow_reload)==true
           Settings.reload!
           status 200

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

@@ -1,7 +1,7 @@
 # Terrific constants
 APP_NAME = "rest-ftp-daemon"
 APP_NICK = "rftpd"
-APP_VER = "0.240.2"
+APP_VER = "0.241"
 
 # Provide default config file information
 APP_LIB = File.expand_path File.dirname(__FILE__)
@@ -89,7 +89,7 @@ DASHBOARD_WORKER_STYLES = {
 
 # Configuration defaults
 DEFAULT_WORKER_TIMEOUT  = 3600
-DEFAULT_FTP_CHUNK       = 512
+DEFAULT_FTP_CHUNK       = 1024
 DEFAULT_PAGE_SIZE       = 40
 DEFAULT_WORKERS         = 1
 

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

@@ -125,7 +125,11 @@ module RestFtpDaemon
     out << "#{seconds}s"
 
     out.join(' ')
-  end
+    end
+
+    def self.dashboard_job_link job
+      "/jobs/#{job.id}" if job.respond_to? :id
+    end
 
   end
 end

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

@@ -1,3 +1,4 @@
+-# coding: utf-8
 !!! 5
 %html{:lang => "en"}
   %head

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

@@ -1,3 +1,4 @@
+-# coding: utf-8
 %h2 Counters
 
 %table.table.table-striped.table-hover.table-condensed

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

@@ -1,3 +1,4 @@
+-# coding: utf-8
 - trans = $queue.counter_get :transferred
 - info_procs = (Facter.value :processorcount).to_i
 

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

@@ -1,3 +1,4 @@
+-# coding: utf-8
 - trans = $queue.counter_get :transferred
 - info_procs = (Facter.value :processorcount).to_i
 - info_load = Sys::CPU.load_avg.first.to_f

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

@@ -1,3 +1,4 @@
+-# coding: utf-8
 - counts_by_status = $queue.counts_by_status
 - counts_all = $queue.jobs_count
 - jobs = @paginate.subset

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

@@ -1,3 +1,4 @@
+-# coding: utf-8
 - jobs.each do |job|
   - progress = job.get :progress
   - source_count = job.get(:source_count) || 0
@@ -12,7 +13,13 @@
 
   %tr{class: trclass.to_s}
     %td
-      %b= job.id
+
+
+      %a{href: Helpers.dashboard_job_link(job)}
+        %b= job.id
+
+
+
 
     %td= job.label
 

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

@@ -1,3 +1,4 @@
+-# coding: utf-8
 %h2 Endpoint tokens
 
 %table.table.table-striped.table-hover.table-condensed

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

@@ -1,3 +1,4 @@
+-# coding: utf-8
 %h2 Workers
 
 %table.table.table-striped.table-hover.table-condensed

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.240.2
+  version: '0.241'
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -345,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RESTful FTP client daemon