rest-ftp-daemon 0.220.4 → 0.221

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e32694d3be7cd99f54730ab7cf523baaa414b010
-  data.tar.gz: 7f2dd8a34044b2d6cb03b6f6c03031abad34f894
+  metadata.gz: fa2898557667a162460cbbf4c682dfc9bfcf05f7
+  data.tar.gz: 9f435fbe56c23978e7302649db5eef6312871e14
 SHA512:
-  metadata.gz: f2a57d6e02576348f30ac149c0622f6bb3fddee2c9d4b5eeaf8427c66af480e2daa39db963132f7e1ee0d89f2433b0254ab3a85af0fcc78d126b3aa2b1bdf6c2
-  data.tar.gz: 412246af911a5d06d59ed4c0bd1c862977c6154eb383912c8468d5caee87d158520de7deb3cf373f065cf1f288776f107345a1e50b5817569797d5acc3907774
+  metadata.gz: d4690191c0a025de1924e6ff8014c6b2a58fed13bf69766a3cca7f60bf863d91723d831a4d426e6d69c8604f8f52f1263f6908c20d6386c0ffd08bb7faf6b08f
+  data.tar.gz: 0f8717306bf40859bbeabd0908942170321b8f8912d09e71677a1c2d2b5861c8ad21e9039d81f166f1d4499d1491ef17aa588d9b399b422aaec7c6bf8bd4c626

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest-ftp-daemon (0.220.4)
+    rest-ftp-daemon (0.221)
       double-bag-ftps
       facter
       get_process_mem
@@ -38,7 +38,7 @@ GEM
     double-bag-ftps (0.1.2)
     equalizer (0.0.11)
     eventmachine (1.0.7)
-    facter (2.4.3)
+    facter (2.4.4)
       CFPropertyList (~> 2.2.6)
     ffi (1.9.8)
     get_process_mem (0.2.0)
@@ -64,8 +64,8 @@ GEM
     minitest (5.6.1)
     multi_json (1.11.0)
     multi_xml (0.5.5)
-    newrelic_rpm (3.11.2.286)
-    rack (1.6.0)
+    newrelic_rpm (3.12.0.288)
+    rack (1.6.1)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-mount (0.8.3)

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

@@ -1,7 +1,7 @@
 # Terrific constants
 APP_NAME = "rest-ftp-daemon"
 APP_NICK = "rftpd"
-APP_VER = "0.220.4"
+APP_VER = "0.221"
 
 
 # Jobs and workers

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

@@ -1,21 +1,14 @@
+/* Common styles
+-------------------------------------------------- */
 .text-right {
   text-align: right;
   }
 
-.transfer-method {
-  /*width: 35px;*/
-  }
-
-.worker-label {
-  /*width: 25px;*/
-  }
-
 .nobr {
   white-space: nowrap;
   }
 
 body, table tr td, .fixed {
-  /*font-family: 'Inconsolata', Verdana, sans-serif;*/
   font-family: 'Verdana', Verdana, sans-serif;
   font-size: 1em;
   }
@@ -24,7 +17,6 @@ body, table tr td, .fixed {
   display: inline-block;
   background-color: #f8f8f8;
   padding: 0 2px;
-  /*font-weight: bold;*/
   }
 
 .label {
@@ -53,12 +45,6 @@ h2 {
   margin-top: 2em;
 }
 
-#header {
-  padding: 20px auto;
-  border-bottom: 1px solid silver;
-  background-color: #eee;
-  }
-
 .progress {
   margin-bottom: 0;
   /*min-width: 60px;*/
@@ -69,11 +55,6 @@ a.class {
   }
 
 
-a.page.btn {
-  /*font-weight: bold;*/
-  /*font-size: 1.5em;*/
-  }
-
 .debug {
   border: 1px solid orange;
 }
@@ -87,3 +68,42 @@ a.page.btn {
 }
 
 
+
+
+
+/* Header styles
+-------------------------------------------------- */
+.header-indicators {
+  /*border: 1px solid red;*/
+  margin-top: 20px;
+  margin-bottom: 4px;
+}
+
+
+/* Footer styles
+-------------------------------------------------- */
+html {
+  position: relative;
+  min-height: 100%;
+}
+body {
+  margin-bottom: 40px;
+}
+.footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 40px;
+  background-color: #f5f5f5;
+  border-top: 1px solid #e7e7e7;
+}
+.footer-signature {
+  /*border: 1px solid blue;*/
+  margin-top: 12px;
+}
+
+.footer-indicators {
+  /*border: 1px solid blue;*/
+  margin-top: 5px;
+  /*margin-bottom: 2px;*/
+}

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

@@ -19,16 +19,18 @@
               = "v#{APP_VER}"
               = "[#{Settings.namespace}]"
 
+        .navbar-header.pull-right
+          .header-indicators
+            =# render :dashboard_indicators
+            = render :dashboard_status
 
     .container-fluid
 
-      = render :dashboard_headers
-
-      %br
-      %br
       %br
 
-      = render :dashboard_jobs
+      .row
+        #box-jobs.col-md-12
+          = render :dashboard_jobs
 
       .row
         #box-tokens.col-md-6
@@ -40,4 +42,20 @@
         #box-counters.col-md-3
           = render :dashboard_counters
 
-      %br
+
+    .footer
+      .container-fluid
+
+        .footer-signature.pull-left
+
+          © 2014
+          ·
+          %a{href: "http://bmconseil.com"}Bruno Medici Consultant
+          ·
+          %a{href: "http://github.com/bmedici/rest-ftp-daemon"} GitHub project page
+
+        .footer-indicators.pull-right
+          = render :dashboard_infos
+          =# render :dashboard_status
+
+

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

@@ -0,0 +1,19 @@
+- trans = $queue.counter_get :transferred
+- info_procs = (Facter.value :processorcount).to_i
+
+
+.btn-group.btn-group-sm
+  .btn.btn-default.btn-info Host
+  .btn.btn-default= Settings.host
+
+.btn-group.btn-group-sm
+  .btn.btn-default.btn-info IP
+  .btn.btn-default= Facter.value(:ipaddress)
+
+.btn-group.btn-group-sm
+  .btn.btn-default.btn-info Cores
+  .btn.btn-default= info_procs
+
+.btn-group.btn-group-sm
+  .btn.btn-default.btn-info Started
+  .btn.btn-default= Helpers.datetime_short(APP_STARTED)

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

@@ -2,22 +2,22 @@
 - counts_all = $queue.jobs_count
 - jobs = @paginate.subset
 
-
 .row
 
   .col-md-5
-    .btn-group.btn-group-md
+    .btn-group.btn-group-sm
       - klass = @only.empty? ? "btn-info" : ""
       %a.btn.btn-default{href: "?only=", class: klass}
         ALL (#{counts_all})
-    .btn-group.btn-group-md
+    .btn-group.btn-group-sm
       - counts_by_status.each do |status, count|
         - klass = (status.to_s == @only) ? "btn-info" : ""
         %a.btn.btn-default{href: "?only=#{status}", class: klass}
           #{status} (#{count})
 
   .col-md-7
-    = @paginate.browser
+    .btn-group.btn-group-sm
+      = @paginate.browser
 
 
 

data/lib/rest-ftp-daemon/views/{dashboard_headers.haml → dashboard_status.haml}

@@ -6,18 +6,6 @@
 - mem = GetProcessMem.new
 
 
-.btn-group.btn-group-sm
-  .btn.btn-default.btn-success Host
-  .btn.btn-default= Settings.host
-
-.btn-group.btn-group-sm
-  .btn.btn-default.btn-success IP
-  .btn.btn-default= Facter.value(:ipaddress)
-
-.btn-group.btn-group-sm
-  .btn.btn-default.btn-success Cores
-  .btn.btn-default= info_procs
-
 .btn-group.btn-group-sm
   .btn.btn-default.btn-warning Load
   .btn.btn-default= info_load.round(1)
@@ -31,11 +19,11 @@
   .btn.btn-default= Helpers.format_bytes(mem.bytes, "B")
 
 .btn-group.btn-group-sm
-  .btn.btn-default.btn-info Processed
-  .btn.btn-default= info_processed
+  .btn.btn-default.btn-success Processed
+  .btn.btn-default= info_processed.to_i
 
 .btn-group.btn-group-sm
-  .btn.btn-default.btn-info Transferred
+  .btn.btn-default.btn-success Transferred
   .btn.btn-default= Helpers.format_bytes(trans, "B")
 
 

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

@@ -50,7 +50,6 @@
       - unless job.error || job.status == JOB_STATUS_FINISHED
         .progress
           .progress-bar{style:"width: #{progress}%;"}
-            =# "#{progress}%" unless progress.nil?
             = Helpers.format_bytes(job.get(:transfer_sent), "B")
 
       - else

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

@@ -44,6 +44,9 @@ module RestFtpDaemon
     rescue RestFtpDaemon::JobTimeout => ex
       log_error "JOB TIMED OUT", lines: ex.backtrace
       worker_status :timeout
+      worker_jid nil
+      job.wid = nil
+
       job.oops_you_stop_now ex unless job.nil?
       sleep 1
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-ftp-daemon
 version: !ruby/object:Gem::Version
-  version: 0.220.4
+  version: '0.221'
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -246,8 +246,9 @@ files:
 - lib/rest-ftp-daemon/uri.rb
 - lib/rest-ftp-daemon/views/dashboard.haml
 - lib/rest-ftp-daemon/views/dashboard_counters.haml
-- lib/rest-ftp-daemon/views/dashboard_headers.haml
+- lib/rest-ftp-daemon/views/dashboard_infos.haml
 - lib/rest-ftp-daemon/views/dashboard_jobs.haml
+- lib/rest-ftp-daemon/views/dashboard_status.haml
 - lib/rest-ftp-daemon/views/dashboard_table.haml
 - lib/rest-ftp-daemon/views/dashboard_tokens.haml
 - lib/rest-ftp-daemon/views/dashboard_workers.haml