rest-ftp-daemon 0.230.2 → 0.230.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07eb1912cd6810fa2ba2c5a6805801b08f3ea927
-  data.tar.gz: 24b389a1da29bf8ae6ebff64fdd9f357a630e4ad
+  metadata.gz: 3f72c3669b691a64c1051949e27b3c5bef4674da
+  data.tar.gz: 5fcab534e9f49e300e496fe87d6a38c4f19f678f
 SHA512:
-  metadata.gz: 44841acce2dfb846ba06504d33f1f6a73740fa701fc4d5aa2c7f34660adc78b253468cbac52f2f19762917aee6e77079df132a2a84d1476bcb8b2382b49721a3
-  data.tar.gz: e179d8cb2172e62b79e6cc06a16403305592ff5362f6996d7a0a704f693e6360549e3db77714efa83ab4d3d2ca777f5c3215cf964757ea6a559da4d0c5ac18c9
+  metadata.gz: 0e67365b6601e4f2ae720277283a5474252097a04fc58b728327dcf755a80c39c50b77fde796dc3810a872dccd50f5b7c4f574c719dac37e102d02de91bde239
+  data.tar.gz: 1a836471155747b9be417dc4196d1dbcee9abce63502cbe47dc9f9075642ed4fc010e1623350184754b475f7af7fd1579b45c3e16f904f1b71b1647e92af2502

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.230.2)
+    rest-ftp-daemon (0.230.3)
       double-bag-ftps
       facter
       get_process_mem

data/config.ru

@@ -25,7 +25,7 @@ end
 GC::Profiler.enable if Settings.newrelic_enabled?
 
 # Serve static assets
-use Rack::Static, :urls => ["/css", "/images"], :root => "#{APP_LIBS}/static/"
+use Rack::Static, :urls => ["/css", "/js", "/images"], :root => "#{APP_LIBS}/static/"
 
 # Launch the main daemon
 run RestFtpDaemon::API::Root

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

@@ -1,7 +1,7 @@
 # Terrific constants
 APP_NAME = "rest-ftp-daemon"
 APP_NICK = "rftpd"
-APP_VER = "0.230.2"
+APP_VER = "0.230.3"
 
 
 # Jobs and workers
@@ -25,6 +25,7 @@ WORKER_STATUS_TIMEOUT   = :timeout
 WORKER_STATUS_CRASHED   = :crashed
 WORKER_STATUS_CLEANING  = :cleaning
 
+
 # Logging and startup
 LOG_PIPE_LEN            = 10
 LOG_COL_WID             = 8
@@ -37,12 +38,12 @@ LOG_FORMAT_TIME         = "%Y-%m-%d %H:%M:%S"
 LOG_FORMAT_PREFIX       = "%s %s\t%-#{LOG_PIPE_LEN.to_i}s\t"
 LOG_FORMAT_MESSAGE      = "%#{-LOG_COL_WID.to_i}s\t%#{-LOG_COL_JID.to_i}s\t%#{-LOG_COL_ID.to_i}s"
 LOG_NEWLINE             = "\n"
-LOG_INDENT             = "\t"
+LOG_INDENT              = "\t"
 
 
 # Notifications
 NOTIFY_PREFIX           = "rftpd"
-NOTIFY_USERAGENT        = "#{APP_NAME} - #{APP_VER}"
+NOTIFY_USERAGENT        = "#{APP_NAME}/v#{APP_VER}"
 NOTIFY_IDENTIFIER_LEN   = 4
 
 
@@ -67,10 +68,11 @@ DASHBOARD_WORKER_STYLES = {
 DEFAULT_WORKER_TIMEOUT  = 3600
 DEFAULT_FTP_CHUNK       = 512
 DEFAULT_PAGE_SIZE       = 40
+DEFAULT_WORKERS         = 1
 
 
 # Initialize defaults
 APP_STARTED = Time.now
 APP_LIBS = File.dirname(__FILE__)
-APP_WORKERS = 1
+
 

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

@@ -60,7 +60,6 @@ module RestFtpDaemon
 
       # Read source file size and parameters
       @notify_after_sec = Settings.transfer.notify_after_sec rescue nil
-      @chunk_size = DEFAULT_FTP_CHUNK * 1024
 
       # Flag current job
       @queued_at = Time.now

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

@@ -62,7 +62,7 @@ module RestFtpDaemon
       headers = {
         "Content-Type"  => "application/json",
         "Accept"        => "application/json",
-        "User-Agent"    => "#{APP_NAME} - #{APP_VER}"
+        "User-Agent"    => NOTIFY_USERAGENT
          }
       data = flags.to_json
 

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

@@ -3,17 +3,17 @@
   - source_count = job.get(:source_count) || 0
   - source_processed = job.get(:source_processed) || 0
   - source_current = job.get(:source_current)
-  - presented = present job, with: RestFtpDaemon::API::Entities::JobPresenter, hide_params: true
+  - job_presented = entity_representation_for(RestFtpDaemon::API::Entities::JobPresenter, job, {})
   - bitrate = job.get :transfer_bitrate
 
+
   - trclass = DASHBOARD_JOB_STYLES[job.status]
 
   - unless job.error.nil?
     - trclass = "warning"
 
   %tr{class: trclass.to_s}
-
-    %td{title: presented.to_json}
+    %td{title: job_presented.to_json}
       %b= job.id
 
     %td= job.label
@@ -72,3 +72,6 @@
         .label.label-warning.flag.worker-label= job.wid
 
 
+
+
+

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

@@ -51,7 +51,7 @@ module RestFtpDaemon
 
     def create_threads
       # Read configuration
-      number_threads = (Settings.workers || APP_WORKERS)
+      number_threads = (Settings.workers || DEFAULT_WORKERS)
 
       if number_threads < 1
         log_error "create_threads: one worker is the minimum possible number (#{number_threads} configured)"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.230.2
+  version: 0.230.3
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler