six-updater-web 0.14.10 → 0.14.12

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater-web'
-  s.version = '0.14.10'
+  s.version = '0.14.12'
   s.has_rdoc = false
   #s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/bin/six-updater-web

@@ -13,5 +13,6 @@ rescue => e
   rescue
     puts "ERROR: #{$!}"
   end
-  sleep 10
+  sleep 5
+  Process.exit(1) # Return error-1
 end

data/bin/six-updater-web-rake

@@ -14,5 +14,6 @@ rescue => e
   rescue
     puts "ERROR: #{$!}"
   end
-  sleep 10
+  sleep 5
+  Process.exit(1) # Return error-1
 end

data/lib/six-updater-web/app/models/sixconfig.rb

@@ -246,12 +246,13 @@ class Sixconfig < ActiveRecord::Base
                 if Time.now - previous > 2
                   previous = Time.now
                   done = []
+                  messages.uniq!
                   begin
-                    messages.uniq.each {|msg| msg.save; done << msg}
+                    messages.each {|msg| msg.save; done << msg}
                   rescue => e
                     backtrace(e, log)
                   end
-                  messages -= done                  
+                  messages -= done
                 end
               end
             end
@@ -276,8 +277,10 @@ class Sixconfig < ActiveRecord::Base
 
             # Handle status and pid
             if shebang
-              shebang[/^SIX-SHEBANG: ([0-9]*), ([0-9]*)/]
-              pid, status = $1.to_i, $2.to_i
+              if shebang[/^SIX-SHEBANG: (-?.*), (-?.*)/]
+                pid = $1.to_i if $1
+                status = $2.to_i if $2
+              end
             end
           else
             # Handle last bits in the buffer
@@ -297,10 +300,16 @@ class Sixconfig < ActiveRecord::Base
         end
 
         unless messages.empty?
-          begin
-            messages.each {|msg| msg.save}
-          rescue => e
-            backtrace(e, log)
+          i = 0; done = false
+          until done || i > 3
+            i += 1
+            begin
+              messages.each {|msg| msg.save}
+              done = true
+            rescue => e
+              backtrace(e, log)
+              sleep 2
+            end
           end
         end
       end

data/lib/six-updater-web/config/six-updater-web.rb

@@ -22,7 +22,7 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.14.10"
+  VERSION = "0.14.12"
   COMPONENT = "six-updater-web"
 
   DEFAULT_IP = "127.0.0.1" unless defined?(DEFAULT_IP)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 14
-  - 10
-  version: 0.14.10
+  - 12
+  version: 0.14.12
 platform: ruby
 authors: 
 - Sickboy