rest-ftp-daemon 0.90.1 → 0.94.4

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

@@ -76,23 +76,16 @@ module RestFtpDaemon
       end
     end
 
-    # def by_status status
-    #   return [] if status.nil?
-
-    #   # Select jobs from the queue if their status is (status)
-    #   all.select { |item| item.get(:status) == status.to_sym }
-    # end
-
     def popped_reverse_sorted_by_status status
       return [] if status.nil?
 
       # Select jobs from the queue if their status is (status)
-      ordered_popped.reverse.select { |item| item.get(:status) == status.to_sym }
+      ordered_popped.reverse.select { |item| item.status == status.to_sym }
     end
 
-    def popped_counts_by_status
+    def counts_by_status
       statuses = {}
-      @popped.group_by { |job| job.get(:status) }.map { |status, jobs| statuses[status] = jobs.size }
+      all.group_by { |job| job.status }.map { |status, jobs| statuses[status] = jobs.size }
       statuses
     end
 
@@ -114,12 +107,18 @@ module RestFtpDaemon
       @queued.select { |item| item.id == id }.last || @popped.select { |item| item.id == id }.last
     end
 
-    def push obj
+    def push job
       # Check that item responds to "priorty" method
-      raise "JobQueue.push: object should respond to priority method" unless obj.respond_to? :priority
+      raise "JobQueue.push: job should respond to priority method" unless job.respond_to? :priority
 
       @mutex.synchronize do
-        @queued.push obj
+        # Push job into the queue
+        @queued.push job
+
+        # Tell the job it's been queued
+        job.set_queued if job.respond_to? :set_queued
+
+        # Try to wake a worker up
         begin
           t = @waiting.shift
           t.wakeup if t
@@ -165,7 +164,7 @@ module RestFtpDaemon
     end
 
     def ordered_popped
-      @popped.sort_by { |item| [item.get(:updated_at)] }
+      @popped.sort_by { |item| [item.updated_at] }
     end
 
   protected
@@ -195,10 +194,10 @@ module RestFtpDaemon
       # Delete jobs from the queue if their status is (status)
       @popped.delete_if do |job|
         # Skip it if wrong status
-        next unless job.get(:status) == status.to_sym
+        next unless job.status == status.to_sym
 
         # Skip it if updated_at invalid
-        updated_at = job.get(:updated_at)
+        updated_at = job.updated_at
         next if updated_at.nil?
 
         # Skip it if not aged enough yet

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

@@ -37,8 +37,7 @@ module RestFtpDaemon
         error:    params[:error],
         host:     Settings['host'].to_s,
         }
-      body[:status] = params[:status] if (params[:status].is_a? Enumerable)
-      # && (!params[:status].empty?)
+      body[:status] = params[:status] if (params[:status].is_a? Enumerable) unless params[:status].nil?
 
       # Send message in a thread
       Thread.new do |thread|

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

@@ -4,14 +4,55 @@
 
 .transfer-method {
   display: inline-block;
-  width: 35px;
-  padding: 4px 1px;
+  /*width: 35px;*/
+  padding: 3px 3px;
   font-weight: normal;
   }
 
 .nobr {
   white-space: nowrap;
   }
-.fixed {
-  font-family:monospace;
+
+table tr td, .fixed {
+  font-family: 'Inconsolata', sans-serif;
+  font-size: 1em;
+  }
+
+.token {
+  display: inline-block;
+  background-color: #f8f8f8;
+  padding: 0 2px;
+  /*font-weight: bold;*/
   }
+
+/*
+.label-outline.badge-success {
+    border-color: #468847;
+}
+*/
+.label-outline {
+    color: black;
+    border: 1px solid #999;
+    background-color: transparent;
+}
+
+.flag {
+  margin-right: 3px;
+}
+
+h2 {
+  font-size: 1.5em;
+  margin-top: 2em;
+}
+
+#header {
+  padding: 20px auto;
+  border-bottom: 1px solid silver;
+  background-color: #eee;
+  }
+
+.progress {
+  margin-bottom: 0;
+  }
+
+

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

@@ -4,26 +4,9 @@
     %meta{:charset => "utf-8"}/
     %link{ href:"/css/bootstrap.css" , rel: "stylesheet"}
     %link{ href:"/css/main.css" , rel: "stylesheet"}
-
+    %link{ href:"http://fonts.googleapis.com/css?family=Inconsolata:400,700" , rel: "stylesheet"}
     %title="#{Settings['host']} [#{Settings.namespace}] #{APP_NAME}"
 
-    :css
-
-      h2 {
-        font-size: 1.5em;
-        margin-top: 2em;
-      }
-
-      #header {
-        padding: 20px auto;
-        border-bottom: 1px solid silver;
-        background-color: #eee;
-        }
-
-      .progress {
-        margin-bottom: 0;
-        }
-
   %body
 
     .navbar.navbar-default.navbar-fixed
@@ -39,38 +22,10 @@
 
     .container
 
-      - trans = $queue.counter_get :transferred
-      .btn-group.btn-group-sm
-        .btn.btn-default.btn-success Processors
-        .btn.btn-default= @info_procs
-
-      .btn-group.btn-group-sm
-        .btn.btn-default.btn-success IP
-        .btn.btn-default= @info_ipaddr
-
-      .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-warning Load
-        .btn.btn-default= @info_load.round(1)
-
-      .btn-group.btn-group-sm
-        .btn.btn-default.btn-warning CPU
-        .btn.btn-default= "#{@info_norm} %"
-
-      .btn-group.btn-group-sm
-        .btn.btn-default.btn-warning Free
-        .btn.btn-default= @info_memfree
-
-      .btn-group.btn-group-sm
-        .btn.btn-default.btn-info Transferred
-        .btn.btn-default= Helpers.format_bytes(trans, "B")
-
+      = render :dashboard_headers
 
       .row
-        .col-md-10
+        .col-md-12
 
           %h2
             Jobs  
@@ -88,13 +43,14 @@
           %table.table.table-striped.table-hover.table-condensed
             %tr
               %th JID
-              %th prio
-              %th worker
+              %th P
+              %th W
               %th source
               %th target
+              %th started
               %th status
-              %th error
               %th progress
+              %th error
               %th.text-right size
               %th.text-right bitrate
 
@@ -106,10 +62,15 @@
             = render :dashboard_jobs, {jobs: @jobs_popped, counts: @counts}
 
 
-        .col-md-2
-          = render :dashboard_workers, {}
 
-      = render :dashboard_tokens, {tokens: Settings.endpoints || {}}
+      .row
+        .col-md-7
+          = render :dashboard_tokens, {tokens: Settings.endpoints || {}}
+
+        .col-md-3
+          = render :dashboard_workers
+
+        .col-md-2
+          = render :dashboard_counters
 
-      %br
       %br

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

@@ -0,0 +1,14 @@
+%h2 Counters
+
+%table.table.table-striped.table-hover.table-condensed
+
+  %tr
+    %th counter
+    %th.text-right value
+
+  - $queue.counters.each do |name, value|
+
+    %tr
+      %td= name
+      %td.text-right= value
+

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

@@ -0,0 +1,29 @@
+- trans = $queue.counter_get :transferred
+.btn-group.btn-group-sm
+  .btn.btn-default.btn-success Processors
+  .btn.btn-default= @info_procs
+
+.btn-group.btn-group-sm
+  .btn.btn-default.btn-success IP
+  .btn.btn-default= @info_ipaddr
+
+.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-warning Load
+  .btn.btn-default= @info_load.round(1)
+
+.btn-group.btn-group-sm
+  .btn.btn-default.btn-warning CPU
+  .btn.btn-default= "#{@info_norm} %"
+
+.btn-group.btn-group-sm
+  .btn.btn-default.btn-warning Free
+  .btn.btn-default= @info_memfree
+
+.btn-group.btn-group-sm
+  .btn.btn-default.btn-info Transferred
+  .btn.btn-default= Helpers.format_bytes(trans, "B")
+

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

@@ -1,45 +1,51 @@
 - jobs.each do |job|
-  - error = job.get :error
-  - status = job.get :status
   - size = job.get :transfer_total
   - progress = job.get :progress
-  - transfer_source_count = job.get(:transfer_source_count) || 0
-  - transfer_source_done = job.get(:transfer_source_done) || 0
+  - source_count = job.get(:source_count) || 0
+  - source_processed = job.get(:source_processed) || 0
+  - source_processing = job.get(:source_processing)
+  - presented = present job, :with => RestFtpDaemon::API::Entities::JobPresenter, hide_params: true
 
-  - if error!=0 && !error.nil?
+  - if !job.error.nil?
     - trclass = "danger"
-  - elsif status == :uploading
+  - elsif job.status == :uploading
     - trclass = "info"
-  - elsif status == :finished
+  - elsif job.status == :finished
     - trclass = "success"
   - else
     - trclass = "warning"
 
+
   %tr{class: trclass}
 
-    %td= job.id
+    %td{title: presented.to_json}= job.id
+
+    %td
+      - unless job.priority.nil?
+        = job.priority
+
+    %td
 
-    %td= job.get :priority
 
-    %td= job.wid
+      - unless job.wid.nil?
+        .label.label-warning.flag= "w#{job.wid}"
 
-    %td.fixed{title: job.get(:source_path)}
-      = Helpers.job_method_label job.get(:source_method)
-      = job.get :source
+    %td{title: job.get(:source_path)}
+      =# Helpers.job_method_label job.get(:source_method)
+      = Helpers.highlight_tokens job.source
 
-    %td.fixed{title: job.get(:target_url)}
+    %td{title: job.get(:target_url)}
       = Helpers.job_method_label job.get(:target_method)
-      = job.get :target
+      =# job.target
+      = Helpers.highlight_tokens job.target
 
     %td
-      = status
-      - if (transfer_source_count > 0) #&& (transfer_source_done < transfer_source_count)
-        %small= " #{transfer_source_done}/#{transfer_source_count}"
+      = Helpers.datetime_short(job.started_at)
 
     %td
-      = error
-      - unless progress.nil? || status == :finished
-        %small= "#{progress}%"
+      = job.status
+      - if (source_count > 1) && (source_processed < source_count)
+        %small= " #{source_processed}/#{source_count}"
 
     %td
       - unless progress.nil?
@@ -47,6 +53,15 @@
           .progress-bar{style:"width: #{progress}%;"}
             = Helpers.format_bytes job.get(:transfer_sent), "B"
 
+    %td
+      - unless job.error || job.status == :finished
+        - unless progress.nil?
+          = "#{progress}%"
+        - unless source_processing.nil?
+          %small= " (#{source_processing})"
+      - else
+        = Helpers.text_or_empty(job.error)
+
     %td.nobr.text-right
       = Helpers.format_bytes(size, "B")
 
@@ -54,3 +69,4 @@
       - if (bitrate = job.get :transfer_bitrate)
         =  Helpers.format_bytes(bitrate, "bps")
 
+

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

@@ -1,9 +1,14 @@
 %h2 Endpoint tokens
 
 %table.table.table-striped.table-hover.table-condensed
+
+  %tr
+    %th token
+    %th value
+
   - tokens.each do |token, value|
     %tr
       %td
-        %b= Helpers.tokenize(token)
+        = Helpers.tokenize(token)
       %td
         = value

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

@@ -1,45 +1,29 @@
 - styles = {waiting: :success, processing: :info, crashed: :error, done: :success }
 
-%h2
-  Workers
-  = " "
-
-  .btn-group.btn-group-md
-    .btn.btn-default
-      = Settings.workers
-
+%h2 Workers
 
 %table.table.table-striped.table-hover.table-condensed
 
   %tr
-    %th= "WID"
-    %th= "status"
-    %th= "job"
-    %th= "time"
+    %th ID
+    %th status
+    %th job
+    %th.text-right idle
 
   - @gworker_statuses.each do |wid, infos|
     - status = infos[:status]
+    - style = styles[status] || ""
+
     - if infos[:active_at].is_a? Time
       - no_news_for = (Time.now - infos[:active_at]).round(0)
     - else
       - no_news_for = "?"
 
-    -# status = :waiting
-    - style = styles[status] || ""
-    -# style = "success"
-
     %tr{class: style.to_s}
-
       %td= wid
       %td= infos[:status]
       %td= infos[:jobid]
-      %td
+      %td.text-right
         = no_news_for
-
-%h2 Counters
-- $queue.counters.each do |name, value|
-  %b= "#{name}"
-  = value
-  %br
-
+        s