rest-ftp-daemon 0.100.2 → 0.101

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a45abd6abf0d38a6dca977c42e81c1cf538dbd77
-  data.tar.gz: a0d3f0fd02e570f9f0f3d56ae403607e0d854a43
+  metadata.gz: b3c42331f0e483617809300fcc7b6623e94e617b
+  data.tar.gz: 0184e556177357a18e19a686d3fc3ae852dcbffd
 SHA512:
-  metadata.gz: f3d570450921acd5a1c8d0c61c89ad6ce6b0a97be868e74f3cacf654b3a7695e055345aa3111ca74f068572786b9d52fdbcaa1c2315efee26f8c924211890707
-  data.tar.gz: 733164d4039e1660d50850b889c17704718a65097337d9a9b368ea1b3fc29879e67d4ef27e597a102b8775a1c58ec4dc8461bb81d8be2c790b393bce31d02ca3
+  metadata.gz: ead761e0002d4cfda4409fd43dd1c5828040b204fadb2286898c31ccd428edc41be0dd3c83a334d4c0c35770c5bd77856c3665279b539ca3614460990e5b78c6
+  data.tar.gz: 0518b79a4037e122c99d6ce50e660724f1db21693c0e5abfeeab319f6759dfce66461aaf7bc999500e967f833c67660fbadfa6a00f241be65c6b154099021ab7

data/bin/rest-ftp-daemon

@@ -18,8 +18,9 @@ puts
 options = {}
 parser = OptionParser.new do |opts|
   opts.banner = "Usage: #{File.basename $0} [options] start|stop|restart"
+  opts.on("-c", "--config CONFIGFILE")                                 { |config| APP_CONF = config }
   opts.on("-e", "--environment ENV")                                   { |env| APP_ENV = env }
-  opts.on("", "--dev")                                                 { APP_ENV = "development" }
+  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"] = true }
@@ -28,27 +29,31 @@ parser = OptionParser.new do |opts|
   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 }
   opts.on_tail("-h", "--help", "Show this message")                    { puts opts; exit }
-  opts.on_tail('-v', '--version', "Show version (#{APP_VER})")                      { puts APP_VER; exit }
+  opts.on_tail('-v', '--version', "Show version (#{APP_VER})")         { puts APP_VER; exit }
 end
 begin
   parser.order!(ARGV)
   command = ARGV.shift
   unless ["start", "stop", "restart"].include? command
     puts parser
-    exit 1
+    exit 11
   end
 rescue OptionParser::InvalidOption => e
   puts "EXITING: option parser: #{e.message}"
-  exit 1
+  exit 12
 end
 
-# Load helpers and config
-app_root = File.dirname(__FILE__) + '/../'
+# Build configuration file path from options
+APP_CONF ||= File.expand_path "/etc/#{APP_NAME}.yml"
+unless File.exists? APP_CONF
+  puts "EXITING: cannot read configuration file: #{APP_CONF}"
+  exit 13
+end
+
+# Load helpers and config, and merge options from ARGV into settings
 [:helpers, :config].each do |lib|
   require File.expand_path("#{app_root}/lib/rest-ftp-daemon/#{lib.to_s}")
 end
-
-# Merge options from ARGV into settings
 Settings.merge!(options)
 
 # Display compiled configuration
@@ -67,10 +72,10 @@ puts
 if ["start"].include? command
   if Settings['port'].nil?
     puts "ABORTING: Network port is missing"
-    exit 1
+    exit 14
   elsif RestFtpDaemon::Helpers.local_port_used?(Settings['port'])
     puts "ABORTING: Network port #{Settings['port']} is already in use"
-    exit 1
+    exit 15
   end
 end
 

data/lib/rest-ftp-daemon.rb

@@ -8,8 +8,6 @@ require "facter"
 require "sys/cpu"
 
 
-# require 'celluloid/autostart'
-
 # My libs
 require 'rest-ftp-daemon/constants'
 require 'rest-ftp-daemon/config'

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

@@ -27,7 +27,6 @@ module RestFtpDaemon
         expose :exectime
 
         # Params
-        # expose :wid, unless: lambda { |object, options| object.wid.nil? }
         expose :params, unless: :hide_params
 
       end

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

@@ -60,6 +60,7 @@ module RestFtpDaemon
       params do
         requires :source, type: String, desc: "Source file pattern"
         requires :target, type: String, desc: "Target remote path"
+        optional :label, type: String, desc: "Descriptive label for this job"
         optional :notify, type: String, desc: "URL to get POST'ed notifications back"
         optional :priority, type: Integer, desc: "Priority level of the job (lower is stronger)"
         optional :overwrite, type: Boolean, desc: "wether to overwrites files at target server",
@@ -69,8 +70,7 @@ module RestFtpDaemon
       end
 
       post '/jobs/' do
-        info "POST /jobs"
-        # #{params.inspect}"
+        info "POST /jobs #{params.inspect}"
         # request.body.rewind
         begin
 
@@ -99,7 +99,6 @@ module RestFtpDaemon
         end
       end
 
-
     end
   end
 end

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

@@ -20,7 +20,12 @@ module RestFtpDaemon
 ####### INITIALIZATION
 
       def initialize
+        # Call daddy
         super
+
+        # Check that Queue and Pool are available
+        raise RestFtpDaemon::MissingQueue unless defined? $queue
+        raise RestFtpDaemon::MissingQueue unless defined? $pool
       end
 
 
@@ -54,19 +59,6 @@ module RestFtpDaemon
 
       end
 
-
-####### INITIALIZATION
-
-      def initialize
-        # Call daddy
-        super
-
-        # Check that Queue and Pool are available
-        raise RestFtpDaemon::MissingQueue unless defined? $queue
-        raise RestFtpDaemon::MissingQueue unless defined? $pool
-      end
-
-
     end
   end
 end

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

@@ -1,7 +1,6 @@
 # Terrific constants
 APP_NAME = "rest-ftp-daemon"
-APP_CONF = "/etc/#{APP_NAME}.yml"
-APP_VER = "0.100.2"
+APP_VER = "0.101"
 
 # Some global constants
 IDENT_JOB_LEN = 4

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

@@ -6,7 +6,7 @@ require 'timeout'
 module RestFtpDaemon
   class Job
 
-    FIELDS = [:source, :target, :priority, :notify, :overwrite, :mkdir]
+    FIELDS = [:source, :target, :label, :priority, :notify, :overwrite, :mkdir]
 
     attr_reader :id
     attr_accessor :wid
@@ -32,7 +32,6 @@ module RestFtpDaemon
 
       # Init context
       @id = job_id.to_s
-      #set :id, job_id
       FIELDS.each do |field|
         instance_variable_set("@#{field.to_s}", params[field])
       end
@@ -62,9 +61,6 @@ module RestFtpDaemon
     end
 
     def close
-      # Close logger
-      # info "Job.close"
-      #@logger.close
     end
 
     def process
@@ -308,7 +304,6 @@ module RestFtpDaemon
       ftp_connect_and_login
 
       # Connect remote server, login and chdir
-      #path = '/' + Helpers.extract_dirname(@target_url.path).to_s
       path = Helpers.extract_dirname(@target_url.path).to_s
       ftp_chdir_or_buildpath path
 
@@ -334,6 +329,7 @@ module RestFtpDaemon
       @status = :disconnecting
 
       # Update counters and flags
+      $queue.counter_inc :jobs_finished
       $queue.counter_add :transferred, @transfer_total
       @finished_at = Time.now
     end
@@ -567,7 +563,6 @@ module RestFtpDaemon
       # Done
       set :source_processing, nil
       info "Job.ftp_transfer finished"
-      $queue.counter_inc :jobs_finished
     end
 
     def client_notify signal, error = nil, status = {}

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

@@ -17,12 +17,10 @@ module RestFtpDaemon
       @mutex = Mutex.new
 
       # # Logger
-      # @logger = RestFtpDaemon::Logger.new(:queue, "QUEUE")
       @logger = RestFtpDaemon::LoggerPool.instance.get :queue
 
       # Identifiers generator
       @last_id = 0
-      #@prefix = SecureRandom.hex(IDENT_JOB_LEN)
       @prefix = Helpers.identifier IDENT_JOB_LEN
       info "queue initialized with prefix: #{@prefix}"
 

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

@@ -17,7 +17,6 @@ module RestFtpDaemon
       # Compute file path / STDERR
       logfile = Settings.logs[pipe] if Settings.logs.is_a? Hash
       logfile ||= STDERR
-      #logfile ||= STDOUT
 
       # Create the logger and return it
       logger = Logger.new(logfile, 'daily')   #, 10, 1024000)

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

@@ -15,7 +15,6 @@ module RestFtpDaemon
       @id = Helpers.identifier(IDENT_NOTIF_LEN)
 
       # Logger
-      # @logger = RestFtpDaemon::Logger.new(:workers, "NOTIF #{key}")
       @logger = RestFtpDaemon::LoggerPool.instance.get :notify
 
       # Check context

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

@@ -42,9 +42,10 @@
 
           %table.table.table-striped.table-hover.table-condensed
             %tr
-              %th JID
+              %th ID
               %th P
               %th W
+              %th label
               %th source
               %th target
               %th queued

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

@@ -16,7 +16,6 @@
   - else
     - trclass = "warning"
 
-
   %tr{class: trclass}
 
     %td{title: presented.to_json}= job.id
@@ -29,6 +28,8 @@
       - unless job.wid.nil?
         .label.label-default.flag.worker-label= job.wid
 
+    %td= job.label
+
     %td{title: job.get(:source_path)}
       =# Helpers.job_method_label job.get(:source_method)
       = Helpers.highlight_tokens job.source

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

@@ -1,7 +1,7 @@
 module RestFtpDaemon
   class WorkerPool
 
-    attr_reader :requested, :processed, :wid
+    attr_reader :wid
 
     def initialize number_threads
       # Logger

data/rest-ftp-daemon.yml.sample

@@ -8,8 +8,8 @@ defaults: &defaults
   host: <%= `hostname`.chomp.split('.').first %>
 
   transfer:
-    #update_every_kb: 500
-    #notify_after_sec: 10
+    update_every_kb: 1024
+    notify_after_sec: 10
 
   conchita:
     timer: 10
@@ -17,11 +17,11 @@ defaults: &defaults
     #clean_finished: 600
 
   logs:
-    thin:    "/tmp/rftpd-environment-thin.log"
-    queue:   "/tmp/rftpd-environment-core.log"
-    api:     "/tmp/rftpd-environment-core.log"
-    workers: "/tmp/rftpd-environment-work.log"
-    notify:  "/tmp/rftpd-environment-work.log"
+    thin:    "/var/log/rftpd-environment-thin.log"
+    queue:   "/var/log/rftpd-environment-core.log"
+    api:     "/var/log/rftpd-environment-core.log"
+    workers: "/var/log/rftpd-environment-work.log"
+    notify:  "/var/log/rftpd-environment-work.log"
 
 preprod:
   <<: *defaults

metadata

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