rbbt-rest 1.3.20 → 1.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 384d8085f33759c1e07aacb67e9f510db096939f
-  data.tar.gz: a9909b226a1dfa582c3df13fa4fd53f8cf5eddbe
+  metadata.gz: efb1833a4727a1b9012d07056b6cc440dc562a49
+  data.tar.gz: 2dd0ec5ed6ae09d34ce14aea3e007165198e5d28
 SHA512:
-  metadata.gz: 6088ca28a5bf788b37e002b028044ef88918537a8ecb51a61cda71c2dad43109f5431186fe7d89c939ec08bd05b32674d6d6f771739709c564aebbe4a69f5949
-  data.tar.gz: c1b0ce1b9bb06902f3ac13ad0771594dc07d1808fbba14700b6573ceaad5d82a9e90e63eafc368c17644f3c81245797d3acf02f0dc31d5550495bd37d0bc69d7
+  metadata.gz: cd9d511067b530fbd7c9c4f9295704f9d8eef1800b58bc705131fe29af47ace6149ee9dc44e35bebaa1d8d4bb96bdad899cee3f45707873513a2529b01c37f1c
+  data.tar.gz: eb42097c68c1e36f703f3cc80e836ab0ac8b319ac47f1ab19b0810439e5e2325f9acd23914bb27445f41301b5abe2357f0225ddd28406d7589f38bf3d218a91b

data/lib/rbbt/rest/common/render.rb

@@ -26,7 +26,8 @@ module RbbtRESTHelpers
 
       halt 400, result
     else
-      halt 400, "#{klass}: " << msg << "\nBacktrace: " << btk * "\n"
+      content_type :text
+      halt 400, "#{klass}: " << msg << "\nBacktrace: " << bkt * "\n"
     end
   end
 

data/lib/rbbt/rest/common/table.rb

@@ -267,11 +267,14 @@ module RbbtRESTHelpers
     table_code = options[:table_id] || (rand * 100000).to_i.to_s
     table_code = Entity::REST.clean_element(table_code)
     table_code.sub!(/[^\w]/,'_')
-    table_file = @step.file(table_code)
 
-    url = add_GET_param(@fullpath, "_fragment", File.basename(table_file))
-    url = remove_GET_param(url, "_update")
-    url = remove_GET_param(url, "_")
+    if @step
+      table_file = @step.file(table_code) if @step
+
+      url = add_GET_param(@fullpath, "_fragment", File.basename(table_file))
+      url = remove_GET_param(url, "_update")
+      url = remove_GET_param(url, "_")
+    end
 
     table_class = []
     table_class << 'wide responsive' if tsv.fields.length > 4
@@ -305,17 +308,20 @@ module RbbtRESTHelpers
       @table_filters = {}
     end
 
-    Open.write table_file, tsv.to_s
-    Open.write table_file + '.table_options', options.to_yaml if defined? options.any?
+    if table_file
+      Open.write table_file, tsv.to_s
+      Open.write table_file + '.table_options', options.to_yaml if defined? options.any?
 
-    total_size = tsv.size
-    if options[:page].nil?  and total_size > PAGE_SIZE * 1.2
-      @page = "1"
+      total_size = tsv.size
+      if options[:page].nil?  and total_size > PAGE_SIZE * 1.2
+        @page = "1"
+      else
+        @page = options[:page]
+      end
+      tsv2html(table_file, options)
     else
-      @page = options[:page]
+      tsv2html(tsv, options)
     end
-
-    tsv2html(table_file, options)
   end
 
 

data/lib/rbbt/rest/main.rb

@@ -7,7 +7,6 @@ require 'sinatra/base'
 require 'sinatra/cross_origin'
 require 'json'
 
-require 'rack/stream'
 module Sinatra
   module RbbtRESTMain
     def add_sass_load_path(path)
@@ -169,9 +168,16 @@ module Sinatra
           raise e unless @format == :html
           halt 500, [e.class.to_s, e.message] * " => "
         end
+        
+        require 'rbbt/rest/monitor'
+        register Sinatra::RbbtRESTMonitor
       end
     end
+
   end
+
+
+  #require 'rack/stream'
   #use Rack::Stream
 end
 

data/lib/rbbt/rest/monitor.rb

@@ -0,0 +1,31 @@
+require 'rbbt/monitor'
+
+module Sinatra
+  module RbbtRESTMonitor
+    def self.registered(base)
+      base.module_eval do
+
+        get '/locks' do
+          lock_info = Rbbt.lock_info
+          case @format
+          when :json
+            halt 200, lock_info.to_json
+          else
+            template_render('monitor/locks', {:lock_info => lock_info}, nil, :cache_type => :none)
+          end
+        end
+
+        get '/jobs/:workflow' do
+          workflow = params[:workflow]
+          job_info = Rbbt.job_info(workflow)
+          case @format
+          when :json
+            halt 200, job_info.to_json
+          else
+            template_render('monitor/jobs', {:workflow => workflow, :job_info => job_info}, nil, :cache_type => :none)
+          end
+        end
+      end
+    end
+  end
+end

data/share/views/compass/app.sass

@@ -11,6 +11,7 @@
 @import "help"
 @import "layout"
 @import "figure"
+@import "monitor"
 
 table
   +rbbt_table

data/share/views/compass/monitor.sass

@@ -0,0 +1,8 @@
+span
+  &.dead, &.aborted, &.error
+    color: red
+  &.alive, &.done
+    color: green
+  &.streaming
+    color: yellow
+

data/share/views/monitor/jobs.haml

@@ -0,0 +1,17 @@
+%h2 #{ workflow.to_s } jobs
+
+- tsv = TSV.setup({}, :key_field => "Name", :fields => ["Task", "Status", "Pid", "Start"], :type => :list, :unnamed => true)
+- job_info.each do |file, info|
+  - next if info[:done]
+  - status, pid, name, start = Step.step_info(file).values_at :status, :pid, :name, :start_time
+  - status = html_tag("span", status, :class => status.to_s.split(">").last)
+  - task = info[:task]
+  - link = html_tag("a", name, :href => "/" << [workflow, task, name] * "/")
+  - if Misc.pid_exists? pid
+    - pid = html_tag("span", pid, :class => 'alive')
+  - else
+    - pid = html_tag("span", pid, :class => 'dead') 
+  - tsv[link] = [task, status, pid, start]
+
+= tsv2html tsv
+

data/share/views/monitor/locks.haml

@@ -0,0 +1,9 @@
+%h1 Locks
+
+= table do
+  - tsv = TSV.setup({}, :key_field => "Lock path", :fields => ["Creation Time", "Access Time", "Pid", "PPid"], :type => :list, :unnamed => true)
+  - lock_info.each do |file,info|
+    - tsv[file] = info.values_at :ctime, :atime, :pid, :ppid
+  - puts tsv.summary
+  - tsv
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.3.20
+  version: 1.3.21
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -206,6 +206,7 @@ files:
 - lib/rbbt/rest/knowledge_base.rb
 - lib/rbbt/rest/knowledge_base/helpers.rb
 - lib/rbbt/rest/main.rb
+- lib/rbbt/rest/monitor.rb
 - lib/rbbt/rest/web_tool.rb
 - lib/rbbt/rest/workflow.rb
 - lib/rbbt/rest/workflow/jobs.rb
@@ -223,6 +224,7 @@ files:
 - share/views/compass/functions.sass
 - share/views/compass/help.sass
 - share/views/compass/layout.sass
+- share/views/compass/monitor.sass
 - share/views/compass/rbbt/form.sass
 - share/views/compass/rbbt/fragment.sass
 - share/views/compass/rbbt/menu.sass
@@ -281,6 +283,8 @@ files:
 - share/views/layout/top_menu/finder.haml
 - share/views/layout/top_menu/user.haml
 - share/views/main.haml
+- share/views/monitor/jobs.haml
+- share/views/monitor/locks.haml
 - share/views/partials/form.haml
 - share/views/partials/table.haml
 - share/views/partials/table/column.haml