rest-ftp-daemon 0.240.0 → 0.240.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d93647c6c82dc619334ae8f906604f0b3472def0
-  data.tar.gz: 00175925d0ffe1d63c3f8b6f21a79985f02ebbb5
+  metadata.gz: f303cbe0f6a333e5e2010cab1bf7f354c6829180
+  data.tar.gz: 45f649a52043aeb05d4200b42dd5357da2c3ddd7
 SHA512:
-  metadata.gz: 08ec5e3fe94b08fd1caa9cae780e32a5ddff96736ce8dcee10d0da70356b36adc3b60bee52c825eac97f3a1704c4aab450c7d778b710eb42477ac2c74ef5defc
-  data.tar.gz: 3479a4a57c9396f39bf8cb5a50b061a1887b5bd2e565621f856976dc7b55b4a51a0c4b078cde8e216c41e81aa91f40cae6b0ee10091f550a725281530012c43f
+  metadata.gz: 89baf03844b3cd88df85f7d5943a5c38d92f52e530a621fd95107e9b7fef72a37e3140022a723d7bdba3554feb644d07cea1a5fe96ee6eab62aa66225413f1cf
+  data.tar.gz: dd8fd4d1f3c94e4ff78297db15fdad98727df6efb396c8b2e39475449924e31ce6cf5f4331fa772e202390be05409ca69bbf59554576e7f84b885ced3af4fbaa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.240.0)
+    rest-ftp-daemon (0.240.1)
       double-bag-ftps
       facter
       get_process_mem
@@ -10,7 +10,6 @@ PATH
       haml
       json
       net-sftp
-      net-ssh (~> 2.10.1.rc1)
       newrelic_rpm
       settingslogic
       sys-cpu
@@ -85,7 +84,7 @@ GEM
     multi_xml (0.5.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.10.1.rc1)
+    net-ssh (2.9.2)
     newrelic_rpm (3.13.0.299)
     parser (2.2.2.6)
       ast (>= 1.1, < 3.0)

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.0"
+APP_VER = "0.240.1"
 
 # Provide default config file information
 APP_LIB = File.expand_path File.dirname(__FILE__)
@@ -93,6 +93,8 @@ DEFAULT_FTP_CHUNK       = 512
 DEFAULT_PAGE_SIZE       = 40
 DEFAULT_WORKERS         = 1
 
+DEFAULT_SFTP_TIMEOUT    = 30
+
 
 # Initialize defaults
 APP_STARTED = Time.now

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

@@ -29,7 +29,7 @@ module RestFtpDaemon
           verbose: verbosity,
           port: @url.port,
           non_interactive: true,
-          #timeout: 3
+          timeout: DEFAULT_SFTP_TIMEOUT
           )
     end
 

data/rest-ftp-daemon.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "settingslogic"
   spec.add_runtime_dependency "haml"
   spec.add_runtime_dependency "json"
-  spec.add_runtime_dependency "net-ssh", "~> 2.10.1.rc1"
+  #spec.add_runtime_dependency "net-ssh", "~> 2.10.1.rc1"
   spec.add_runtime_dependency "net-sftp"
   spec.add_runtime_dependency "double-bag-ftps"
   spec.add_runtime_dependency "facter"

data/rest-ftp-daemon.yml.sample

@@ -14,7 +14,7 @@ defaults: &defaults
     # timeout: 1800             # jobs running for longer than X seconds will be killed
 
   retry:
-    # on_errors: ["net_temp_error", "conn_reset_by_peer", "conn_timed_out", "conn_refused"]
+    # on_errors: ["net_temp_error", "conn_reset_by_peer", "conn_timed_out", "conn_refused", "sftp_auth_failed", "conn_host_is_down", "conn_unreachable", "conn_failed", "conn_openssl_error"]
     # max_runs: 5
     # max_age: 1800
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.240.0
+  version: 0.240.1
 platform: ruby
 authors:
 - Bruno MEDICI
@@ -178,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.10.1.rc1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.10.1.rc1
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement