extface 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f087805cac85a3a24f51cb71fd0a5b97d787f1ca
-  data.tar.gz: 80bcf72379c305197d1281f6b958e5e744b81009
+  metadata.gz: a54d359e0cd0acd064934a6fc0213632c1e960b9
+  data.tar.gz: f2de121b94f6a27f4394229d94668938581134ea
 SHA512:
-  metadata.gz: 03a6973e0839a3c9bbc13605ff74369b36170fc249815828d0a5f6b0f4b21a5a6937c35491c771a0dce5891a37381ab65f8e4021c72ecd18578d125d2156f5d7
-  data.tar.gz: 1a09107b86362f4b101f859f0c5f6e628eb09fd4a1c72e8788eed22c5761e7f2d2ecb09743cf817a987c403c9ee41ffc83fde37771e77874d2979323a23541b9
+  metadata.gz: ce9fc475d6ad9afdaec145de6e380b703d988892603ac87a1d49571410d7ac3c2ab1f2a673c1ea1299858d0bff0b282a5e835a42e4fa2dac563566ff7b2a88d2
+  data.tar.gz: ec83097e39d23d82a146b31d1a84c4852c3b5edec7dfe5e895fe86e428bc498d4c83f650fdaf0aa43024f5918e01aed0964fdfd6324430d83f8544df3406b89a

data/app/controllers/extface/handler_controller.rb

@@ -22,6 +22,7 @@ module Extface
               cookies.permanent[:extface] = job.id
               p "Processing job #{job.id}"
               list, data = r.blpop(job.id, timeout: 1)
+              #TODO rescue here will loose data
               while data
                 response.stream.write data
                 r.publish(job.id, "OK")
@@ -32,7 +33,11 @@ module Extface
         end #redis block
       end
     rescue => e
-      p "will continue next time #{e.message}"
+      if e.instance_of? Timeout::Error
+        p "will continue next time #{e.message}"
+      else
+        render nothing: true, status: :internal_server_error
+      end
     ensure
       response.stream.close
     end

data/app/models/extface/driver_base.rb

@@ -28,7 +28,7 @@ module Extface
     def push(buffer)
       
         if @job
-          Timeout.timeout(10) do
+          Timeout.timeout(Extface.device_timeout) do
             Extface.redis_block do |r|
               r.subscribe(@job.id) do |on| #blocking until delivered
                 on.subscribe do |channel, subscriptions|

data/app/models/extface/job.rb

@@ -3,6 +3,8 @@ module Extface
     belongs_to :device, inverse_of: :jobs
     
     scope :active, ->{ where(arel_table[:completed_at].eq(nil).and(arel_table[:failed_at].eq(nil))) }
+    scope :completed, ->{ where(arel_table[:completed_at].not_eq(nil)) }
+    scope :failed, ->{ where(arel_table[:failed_at].not_eq(nil)) }
     
     def complete!
       self.completed_at = Time.now

data/app/views/extface/devices/show.html.erb

@@ -40,13 +40,13 @@
       
       <dt><%= t('.successful_jobs') %></dt>
       <dd>
-        <%= @device.jobs.count %>
+        <%= @device.jobs.completed.count %>
         (<%= t('.last') %>: <%= distance_of_time_in_words_to_now @device.jobs.maximum(:completed_at) %> ago)
       </dd>
       
       <dt><%= t('.failures') %></dt>
       <dd>
-        <%= @device.jobs.count %>
+        <%= @device.jobs.failed.count %>
         (<%= t('.last') %>: <%= distance_of_time_in_words_to_now @device.jobs.maximum(:failed_at) %> ago)
       </dd>
       

data/lib/extface.rb

@@ -10,6 +10,9 @@ module Extface
   mattr_reader :mappings
   @@mappings = ActiveSupport::OrderedHash.new
   
+  mattr_reader :device_timeout
+  @@device_timeout = 10
+  
   class << self
     def setup
       yield self

data/lib/extface/version.rb

@@ -1,3 +1,3 @@
 module Extface
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: extface
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Alex Vangelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-22 00:00:00.000000000 Z
+date: 2014-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails