rbbt-rest 1.8.34 → 1.8.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aff555891484b75d38d4b59f6fa94aa7308bf824
-  data.tar.gz: f9207a7c427fd0382fa2fb886b1e6dc47fb73e2e
+  metadata.gz: a516ec72b572ee8652fecb55673738870452d051
+  data.tar.gz: dea546caf499830dd2f793f43ee749b2bbbbf61b
 SHA512:
-  metadata.gz: de4e9a33eaebbe627dc1868ad942326c496f5a85ecf9373ad27294aa6f9d4a052e8f85506d62f05d2a69969101cfa6733fde3ad7af6ca2722f281d2e4efad468
-  data.tar.gz: 6ec43b3fe9076f12557731445113ab27634299e45fb9dc641fc6ae104de2de3a5447d26adce2a48ae6fe343f6930d2d11bfae721b386132fddb14fc0e27dd368
+  metadata.gz: 344ce587d69d9e384f6178c434ef8f775415e42c1dc620824556510b4c6b2c17dbed87de455b908181e5fd5e26f2e3b286d346150d59c1a98dd93b62dfb4c3f5
+  data.tar.gz: 34f27766a7c989b0f005aa710c80baf01d08394ab8648f6904e1e285ce7536afabfd94500325680a8d05f867147f3e086d4e9000c58f52adbccaed24e7ace394

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

@@ -7,10 +7,19 @@ module RbbtRESTHelpers
   MEMORY_CACHE = {}
 
   def old_cache(path, check)
+    return false if production?
     return false if check.nil? or check.empty?
     return false if not File.exists? path
     check = [check] unless Array === check
-    return check.select{|file| not File.exists?(file) or File.mtime(file) > File.mtime(path)}.any?
+    check.each do |file|
+      if not File.exists?(file)
+        return true 
+      end
+      if File.mtime(file) > File.mtime(path)
+        return true 
+      end
+    end
+    return false
   end
 
   def cache(name, params = {}, &block)
@@ -43,7 +52,7 @@ module RbbtRESTHelpers
 
     # Clean/update job
 
-    if old_cache(step.path, check) or update == :reload
+    if not @fragment and (old_cache(step.path, check) or update == :reload)
       begin
         pid = step.info[:pid] 
         step.abort if pid and Misc.pid_exists?(pid) and not pid == Process.pid

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

@@ -106,6 +106,7 @@ module RbbtRESTHelpers
 
         fragment_code ||= (rand * 100000).to_i.to_s
         fragment_file = @step.file(fragment_code)
+        pid_file = fragment_file + '.pid'
 
         pid = @step.child{
           begin
@@ -118,11 +119,14 @@ module RbbtRESTHelpers
             Open.write(fragment_file + '.backtrace', $!.backtrace * "\n") if $!.backtrace
             Log.error("Error in fragment: #{ fragment_file }")
             Log.exception $!
+            FileUtils.rm pid_file if File.exists? pid_file
             Kernel.exit! -1
+          ensure
+            FileUtils.rm pid_file if File.exists? pid_file
           end
           Kernel.exit! 0
         }
-        Open.write(fragment_file + '.pid', pid.to_s)
+        Open.write(pid_file, pid.to_s)
 
         url = request.fullpath
         url = remove_GET_param(url, "_update")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.34
+  version: 1.8.35
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake