rest-ftp-daemon 0.94.4 → 0.95.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb821dc634f6867b5475e98868b9e6562117ebd2
-  data.tar.gz: 953acf9755629a9ebae2afaac8f1f54438358afb
+  metadata.gz: 9df54e0c451475506949a750afee4f8c774b3ae7
+  data.tar.gz: 7d73e198e3b5e9d732db27937010cfa912057752
 SHA512:
-  metadata.gz: e1f92e85d401a25533c0239e8798ea71cc6d3862aec7e176c6ff3dd8486396cab93977abd7d94866820a165ac23f4e4e1a6db7f218cb58db6db4aa43ca79875e
-  data.tar.gz: 6d6d0b77b70bf07a84a39918be28502f45ae71ab8ea6641dbf7ecec9aaa667d212c07963294c2e09f24dd8e91770d7af9d10ddc46928d3750b9aed4baa57eef5
+  metadata.gz: 2c3f2f4e7331e3cfb09b0c61005d16429ea3a2a0ac54a223d61c6cb06b45b259ba6d90db6ddf75d851d1d4afc7f28c9f9a069a273795f3828c974783eb699492
+  data.tar.gz: 5cee703b40eb48e6bebc4e78b80d792fe4de5a024b70f6a9b1a72e4fbae56490abb84c3015fb420e6404a95035d650ff5a832aaae5883ffaf2cff19cd4dcda99

data/bin/rest-ftp-daemon

@@ -22,7 +22,8 @@ parser = OptionParser.new do |opts|
   opts.on("", "--dev")                                                 { APP_ENV = "development" }
   opts.on("-p", "--port PORT", "use PORT")                             { |port| options["port"] = port.to_i }
   opts.on("-w", "--workers COUNT", "Use COUNT worker threads")         { |count| options["workers"] = count.to_i }
-  opts.on("-d", "--daemonize", "Run daemonized in the background")     { |bool| options["daemonize"] = bool }
+  opts.on("-d", "--daemonize", "Run daemonized in the background")     { |bool| options["daemonize"] = true }
+  opts.on("-f", "--foreground", "Run in the foreground")               { |bool| options["daemonize"] = false }
   opts.on("-P", "--pid FILE", "File to store PID")                     { |file| options["pidfile"] = file }
   opts.on("-u", "--user NAME", "User to run daemon as (use with -g)")  { |user| options["user"] = user }
   opts.on("-g", "--group NAME", "Group to run daemon as (use with -u)"){ |group| options["group"] = group }

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

@@ -18,7 +18,7 @@ module RestFtpDaemon
         expose :error
         expose :status
 
-        expose :started_at
+        expose :queued_at
         expose :updated_at
         expose :age
 

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

@@ -1,7 +1,7 @@
 # Terrific constants
 APP_NAME = "rest-ftp-daemon"
 APP_CONF = "/etc/#{APP_NAME}.yml"
-APP_VER = "0.94.4"
+APP_VER = "0.95.2"
 
 # Some global constants
 IDENT_JOB_LEN = 4
@@ -20,4 +20,3 @@ APP_LIBS = File.dirname(__FILE__)
 
 # Debugging
 DEBUG_FTP_COMMANDS = false
-

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

@@ -14,7 +14,7 @@ module RestFtpDaemon
     attr_reader :error
     attr_reader :status
 
-    attr_reader :started_at
+    attr_reader :queued_at
     attr_reader :updated_at
 
     attr_reader :params
@@ -43,7 +43,7 @@ module RestFtpDaemon
       @logger = RestFtpDaemon::Logger.new(:workers, "JOB #{id}")
 
       # Flag current job
-      @started_at = Time.now
+      @queued_at = Time.now
       @status = :created
 
       # Send first notification
@@ -51,6 +51,12 @@ module RestFtpDaemon
       client_notify "rftpd.queued"
     end
 
+    def close
+      # Close logger
+      info "Job.close"
+      @logger.close
+    end
+
     def process
       # Update job's status
       @error = nil
@@ -107,6 +113,9 @@ module RestFtpDaemon
       rescue Errno::ECONNREFUSED => exception
         return oops "rftpd.ended", exception, :job_connexion_refused
 
+      rescue SocketError => exception
+        return oops "rftpd.ended", exception, :job_socket_error
+
       rescue Timeout::Error, Errno::ETIMEDOUT => exception
         return oops "rftpd.ended", exception, :job_timeout
 
@@ -160,8 +169,8 @@ module RestFtpDaemon
   protected
 
     def age
-      return 0 if @started_at.nil?
-      (Time.now - @started_at).round(2)
+      return 0 if @queued_at.nil?
+      (Time.now - @queued_at).round(2)
     end
 
     def wander time
@@ -337,6 +346,8 @@ module RestFtpDaemon
 
       # Prepare notification if signal given
       return unless signal_name
+
+      # Send the real notification
       client_notify signal_name, error_name, notif_status
     end
 

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

@@ -47,7 +47,7 @@
               %th W
               %th source
               %th target
-              %th started
+              %th queued
               %th status
               %th progress
               %th error
@@ -64,13 +64,13 @@
 
 
       .row
-        .col-md-7
+        .col-md-6
           = render :dashboard_tokens, {tokens: Settings.endpoints || {}}
 
         .col-md-3
           = render :dashboard_workers
 
-        .col-md-2
+        .col-md-3
           = render :dashboard_counters
 
       %br

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

@@ -5,6 +5,7 @@
   - source_processed = job.get(:source_processed) || 0
   - source_processing = job.get(:source_processing)
   - presented = present job, :with => RestFtpDaemon::API::Entities::JobPresenter, hide_params: true
+  - errmsg = job.get :error_message
 
   - if !job.error.nil?
     - trclass = "danger"
@@ -25,8 +26,6 @@
         = job.priority
 
     %td
-
-
       - unless job.wid.nil?
         .label.label-warning.flag= "w#{job.wid}"
 
@@ -40,7 +39,7 @@
       = Helpers.highlight_tokens job.target
 
     %td
-      = Helpers.datetime_short(job.started_at)
+      = Helpers.datetime_short(job.queued_at)
 
     %td
       = job.status
@@ -60,7 +59,9 @@
         - unless source_processing.nil?
           %small= " (#{source_processing})"
       - else
-        = Helpers.text_or_empty(job.error)
+        .error{title: errmsg}
+          = Helpers.text_or_empty(job.error)
+
 
     %td.nobr.text-right
       = Helpers.format_bytes(size, "B")

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

@@ -56,6 +56,7 @@ module RestFtpDaemon
           job.wid = wid
           job.process
           info "worker [#{wid}] processed [#{job.id}]"
+          job.close
           worker_status wid, :done
 
           # Increment total processed jobs count

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.94.4
+  version: 0.95.2
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler