rest-ftp-daemon 0.306.1 → 0.306.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 372111b2b2e4ff339dd45950692792e665189752
-  data.tar.gz: 951510fba629f42100adc30c231918fad393c19c
+  metadata.gz: e3ba09263b0e0f9b574f05b07e686181872696be
+  data.tar.gz: cb8d3c93c629c8fe885ae561c0a65bcfcca49115
 SHA512:
-  metadata.gz: d0fb55a01ba93e20345e929c3f21191aa43de48934a243f2f007bfb6ec518f360930f543220d8071e8c1bb88932e6f89a932cde241b0abd7e85a4d2e24cf0b64
-  data.tar.gz: eba0e1863549d8de14877bc095324594e8aa217f17c6589b6fdd1763821226673782767680890a4aae6a56f8f16fa64211308ee5d26b83b97a2a4081a2e54625
+  metadata.gz: 020c5dc65568a55a968cf2d1dffd5a85807df9ee204fda3843dd3ba837b3696da9baef16efde60914f980ef1895eb6e6b66f9e46e27b3f4fa66f394ed1e3c71f
+  data.tar.gz: e7fbfb2d4e4fa68aa75d51d87aa631dd698ee6275222d94dcfcedf5f4b2370662f1d6a2bc478390b562ca812cdc59c8c322507510e4c25f1c1f6e03b1e4d6e22

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.306.1)
+    rest-ftp-daemon (0.306.3)
+      activesupport (~> 4.2)
       api-auth
-      bmc-daemon-lib (~> 0.2)
+      bmc-daemon-lib (~> 0.3.1)
       double-bag-ftps
       facter
       get_process_mem
@@ -22,13 +23,14 @@ GEM
   remote: http://rubygems.org/
   specs:
     CFPropertyList (2.2.8)
-    activesupport (5.0.0)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.4.0)
-    api-auth (2.0.0)
+    api-auth (2.0.1)
     ast (2.3.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
@@ -36,7 +38,7 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    bmc-daemon-lib (0.2.0)
+    bmc-daemon-lib (0.3.2)
       chamber (~> 2.9)
     builder (3.2.2)
     chamber (2.9.0)
@@ -45,14 +47,13 @@ GEM
     coderay (1.1.1)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.0.2)
-    daemons (1.2.3)
+    daemons (1.2.4)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
     domain_name (0.5.20160615)
       unf (>= 0.0.5, < 1.0.0)
-    double-bag-ftps (0.1.2)
+    double-bag-ftps (0.1.3)
     enumerable-lazy (0.0.1)
     equalizer (0.0.11)
     eventmachine (1.2.0.1)
@@ -60,7 +61,7 @@ GEM
       CFPropertyList (~> 2.2.6)
     ffi (1.9.14)
     get_process_mem (0.2.1)
-    grape (0.16.2)
+    grape (0.17.0)
       activesupport
       builder
       hashie (>= 2.1.0)
@@ -76,7 +77,7 @@ GEM
     haml (4.0.7)
       tilt
     hashie (3.4.4)
-    http (2.0.2)
+    http (2.0.3)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 1.0.1)
@@ -99,7 +100,7 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (3.2.0)
     netrc (0.11.0)
-    newrelic_rpm (3.16.0.318)
+    newrelic_rpm (3.16.1.320)
     parser (2.3.1.2)
       ast (~> 2.2)
     powerpack (0.1.1)
@@ -120,7 +121,7 @@ GEM
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.1)
+    rspec-core (3.5.2)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -171,4 +172,4 @@ DEPENDENCIES
   rubocop (~> 0.32.0)
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/README.md

@@ -293,7 +293,7 @@ TODO for this document
 Debian install preparation
 ------------------------------------------------------------------------------------
 
-This project is available as a rubygem, requires Ruby 2.2 and RubyGems installed.
+This project is available as a rubygem, requires Ruby 2.2.2 and RubyGems installed.
 
 #### Using rbenv and ruby-build
 
@@ -330,8 +330,8 @@ Use a dedicated user for the daemon, switch to this user and enable rbenv
 Install the right ruby version and activate it
 
 ```
-# rbenv install 2.2.0
-# rbenv local 2.2.0
+# rbenv install 2.2.2
+# rbenv local 2.2.2
 # rbenv rehash
 ```
 

data/config.ru

@@ -12,6 +12,7 @@ $counters = RestFtpDaemon::Counters.new
 
 # Initialize workers
 $pool = RestFtpDaemon::WorkerPool.new
+$pool.start!
 
 # Rack authent
 unless Conf[:adminpwd].nil?

data/defaults.yml

@@ -58,6 +58,8 @@ newrelic:
 logs:
   path:     "/tmp/"
 
+  default:  "rftpd-environment.log"
+
   thin:     "rftpd-environment-thin.log"
   newrelic: "rftpd-environment-newrelic.log"
   queue:    "rftpd-environment-core.log"

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

@@ -3,8 +3,8 @@ module RestFtpDaemon
 
     def self.sample
       # Check validity of globals
-      return log_error "Metrics.sample: invalid WorkerPool" unless $pool.is_a? RestFtpDaemon::WorkerPool
-      return log_error "Metrics.sample: invalid JobQueue"  unless $queue.is_a? RestFtpDaemon::JobQueue
+      return unless $pool.is_a? RestFtpDaemon::WorkerPool
+      return unless $queue.is_a? RestFtpDaemon::JobQueue
 
       # Prepare external deps
       mem = GetProcessMem.new

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

@@ -17,7 +17,7 @@ body, table tr td, .fixed {
   display: inline-block;
   background-color: #fefefe;
   padding: 0 3px;
-  margin: 0 2px;
+  margin: 0 1px;
   border: 1px solid silver;
   border-radius: 0.25em;
   cursor: pointer;

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

@@ -24,7 +24,7 @@
 
       - unless alive
         - trclass = "danger"
-        - status = "DEAD"
+        - status = "UNREACHABLE"
 
       %tr{class: trclass.to_s}
         %td= wid

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

@@ -19,12 +19,38 @@ module RestFtpDaemon
       @mutex = Mutex.new
 
       # Identifiers generator
-      @last_worker_id = 0
+      @seqno = 0
+    end
+
+    def start!
+      # Read configuration or initialize with empty hash
+      pools = Conf.at[:pools]
+      pools = {} unless pools.is_a? Hash
+
+      # Minimum one worker on DEFAULT_POOL
+      if !(pools.is_a? Hash)
+        log_error "create_threads: one JobWorker is the minimum (#{pools.inspect}"
+      end
+      log_info "WorkerPool creating all workers with #{pools.to_hash.inspect}"
 
-      # Create worker threads
-      create_threads
+      # Start ConchitaWorker and ReporterWorker
+      create_thread ConchitaWorker, :conchita
+      create_thread ReporterWorker, :reporter
+
+      # Start JobWorkers threads, ensure we have at least one worker in default pool
+      pools[DEFAULT_POOL] ||= 1
+      pools.each do |pool, count|
+        count.times do
+          my_wid = next_wid()
+          create_thread TransferWorker, my_wid, pool
+        end
+      end
+
+    rescue StandardError => ex
+      log_error "EXCEPTION: #{ex.message}", ex.backtrace
     end
 
+
     def worker_variables
       vars = {}
       @workers.collect do |wid, worker|
@@ -53,42 +79,15 @@ module RestFtpDaemon
       vars
     end
 
-    def next_worker_id
+    def next_wid
       @mutex.synchronize do
-        @last_worker_id += 1
+        @seqno += 1
       end
-      "w#{@last_worker_id}"
-    end
-
-    def create_threads
-      # Read configuration or initialize with empty hash
-      pools = Conf.at[:pools]
-      pools = {} unless pools.is_a? Hash
-
-      # Minimum one worker on DEFAULT_POOL
-      if !(pools.is_a? Hash)
-        log_error "create_threads: one JobWorker is the minimum (#{pools.inspect}"
-      end
-      log_info "WorkerPool creating all workers with #{pools.to_hash.inspect}"
-
-      # Start ConchitaWorker and ReporterWorker
-      create_thread :conchita, ConchitaWorker
-      create_thread :reporter, ReporterWorker
-
-      # Start JobWorkers threads, ensure we have at least one worker in default pool
-      pools[DEFAULT_POOL] ||= 1
-      pools.each do |pool, count|
-        count.times do
-          wid = next_worker_id
-          create_thread(wid, TransferWorker, pool)
-        end
-      end
-
-    rescue StandardError => ex
-      log_error "EXCEPTION: #{ex.message}", ex.backtrace
+      "w#{@seqno}"
     end
 
-    def create_thread wid, klass, pool = nil
+    def create_thread klass, wid, pool = nil
+    # def create_thread wid, klass, pool = nil
       # Spawn thread and add it to my index
       log_info "spawning #{klass.name} wid[#{wid}] pool[#{pool}]"
       @workers[wid] = Thread.new do

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

@@ -13,7 +13,9 @@ module RestFtpDaemon
       @report_newrelic = Conf.newrelic_enabled?
 
       # Check that everything is OK
-      return "invalid timer" unless @config[:timer].to_i > 0
+      return "invalid timer"      unless @config[:timer].to_i > 0
+      # return "invalid WorkerPool" unless $pool.is_a? RestFtpDaemon::WorkerPool
+      # return "invalid JobQueue"   unless $queue.is_a? RestFtpDaemon::JobQueue
       return false
     end
 
@@ -40,6 +42,12 @@ module RestFtpDaemon
       # Get common metrics and dump them to logs
       log_debug "begin metrics sample"
       metrics = Metrics.sample
+
+      # Skip following if no valid metrics collected
+      unless metrics.is_a? Hash
+        log_error "unable to collect metrics"
+        return
+      end
       log_info "collected metrics (newrelic: #{@report_newrelic})", metrics
 
       # Transpose metrics to NewRelic metrics
@@ -47,6 +55,7 @@ module RestFtpDaemon
     end
 
     def report_newrelic metrics
+
       metrics_newrelic = {}
       metrics.each do |group, pairs|
         pairs.each do |key, value|

data/rest-ftp-daemon.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   # Project version
-  spec.version                    = "0.306.1"
+  spec.version                    = "0.306.3"
 
   # Project description
   spec.name                       = "rest-ftp-daemon"
@@ -33,9 +33,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "http"
 
   # Runtime dependencies
-  spec.add_runtime_dependency     "bmc-daemon-lib", "~> 0.2"
+  spec.add_runtime_dependency     "bmc-daemon-lib", "~> 0.3.1"
   spec.add_runtime_dependency     "json", "~> 1.8"
   spec.add_runtime_dependency     "thin", "~> 1.7"
+  spec.add_runtime_dependency     "activesupport", "~> 4.2"
   spec.add_runtime_dependency     "grape"
   spec.add_runtime_dependency     "grape-entity"
   spec.add_runtime_dependency     "settingslogic"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.306.1
+  version: 0.306.3
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-25 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
@@ -394,7 +408,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: RESTful FTP client daemon