six-updater-web 0.14.9 → 0.14.10

data/Rakefile

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

data/lib/six-updater-web/app/controllers/logviews_controller.rb

@@ -12,7 +12,7 @@ class LogviewsController < ApplicationController
   def upd
     s = Log.find(:last, :select => "id,updated_at")
     s = Log.new unless s
-    logger.debug "Latest entry: #{s}"
+    logger.debug "Latest entry: #{s.id}"
 
     #session[:logentry] = 0 unless session[:logentry]
     # Cache'll loop :D

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

@@ -148,6 +148,9 @@ class Sixconfig < ActiveRecord::Base
     previous_r
   end
 
+  # TODO: On Windows, use the wrapper, and SIX-SHEBANG
+  # While on linux we could simply use normal IO.popen as the exitstatus is fine there?
+
   # TODO: FIXME, Can't run this in development atm!
   def self.start_updater_inweb(cli)
     logger.info "Starting #{exec} with #{cli} from #{SixUpdaterWeb::BASE_PATH}"
@@ -160,10 +163,20 @@ class Sixconfig < ActiveRecord::Base
         ses.save
         ses = ses.id # Workaround for some issue with throwing around this record, in development mode.
         messages, buff = [], []
+        shebang = nil
         found_r, previous_r = nil, nil
+        status = nil
+        cmd = case RUBY_PLATFORM
+          when /-mingw32$/, /-mswin32$/
+            "ruby \"#{File.join(RAILS_ROOT, "lib", "wrapper.rb")}\" #{exec} #{cl}"
+          else
+            "#{exec} #{cl}"
+        end
+        
         begin
-          status = Open3.popen3("#{exec} #{cl}") do |io_in, io_out, io_err, waitth|
+          status = IO.popen(cmd) do |io_out| #Open3.popen3("#{exec} #{cl}") do |io_in, io_out, io_err, waitth|
             previous = Time.now
+            #io_in.close
             io_out.sync = true
             io_out.each_byte do |b|
               begin
@@ -178,12 +191,20 @@ class Sixconfig < ActiveRecord::Base
                         buff << char
                         msg = buff.join("")
                         buff = []
-                        previous_r = process_msg(msg, messages, ses, previous_r)
+                        if msg =~ /^SIX-SHEBANG: /
+                          shebang = msg
+                        else
+                          previous_r = process_msg(msg, messages, ses, previous_r)
+                        end
                       else
                         # Other char; Process buffer, then add it to a new buffer
                         msg = buff.join("")
                         buff = []
-                        previous_r = process_msg(msg, messages, ses, previous_r)
+                        if msg =~ /^SIX-SHEBANG: /
+                          shebang = msg
+                        else
+                          previous_r = process_msg(msg, messages, ses, previous_r)
+                        end
                         found_r = true if ["\r"].include?(char)
                         buff << char
                       end
@@ -196,7 +217,11 @@ class Sixconfig < ActiveRecord::Base
                         when "\n"
                           msg = buff.join("")
                           buff = []
-                          previous_r = process_msg(msg, messages, ses, previous_r)
+                          if msg =~ /^SIX-SHEBANG: /
+                            shebang = msg
+                          else
+                            previous_r = process_msg(msg, messages, ses, previous_r)
+                          end
                       end
                     end
                   else
@@ -205,7 +230,11 @@ class Sixconfig < ActiveRecord::Base
                     if ["\r","\n"].include?(char)
                       msg = buff.join("")
                       buff = []
-                      previous_r = process_msg(msg, messages, ses, previous_r)
+                      #if msg =~ /^SIX-SHEBANG: /
+                      #  shebang = msg
+                      #else
+                        previous_r = process_msg(msg, messages, ses, previous_r)
+                      #end
                     end                    
                 end
               rescue => e
@@ -226,13 +255,46 @@ class Sixconfig < ActiveRecord::Base
                 end
               end
             end
+            #status = waitth.value
           end
         rescue => e
           backtrace(e, log)
         end
 
-        # Handle last bits in the buffer
-        process_msg(buff.join(""), messages, ses, previous_r) unless buff.empty?
+        pid, status = nil, 1
+        case RUBY_PLATFORM
+          when /-mingw32$/, /-mswin32$/
+            # Handle last bits in the buffer
+            unless buff.empty?
+              msg = buff.join("")
+              if msg =~ /^SIX-SHEBANG: /
+                shebang = msg
+              else
+                previous_r = process_msg(msg, messages, ses, previous_r)
+              end
+            end
+
+            # Handle status and pid
+            if shebang
+              shebang[/^SIX-SHEBANG: ([0-9]*), ([0-9]*)/]
+              pid, status = $1.to_i, $2.to_i
+            end
+          else
+            # Handle last bits in the buffer
+            unless buff.empty?
+              msg = buff.join("")
+              previous_r = process_msg(msg, messages, ses, previous_r)
+            end
+
+            # Handle status and pid
+            pid, status = $?.pid, $?.exitstatus
+        end
+
+        if status > 0
+          messages << Log.new(:logsession_id => ses, :content => "Abnormal program termination. #{pid}: #{status}")
+        else
+          messages << Log.new(:logsession_id => ses, :content => "Normal program termination. #{pid}: #{status}")
+        end
 
         unless messages.empty?
           begin

data/lib/six-updater-web/app/views/main/logoutput.erb

@@ -1,5 +1,5 @@
 <%#= periodically_call_remote(:url => 'log', :frequency => '1', :update => 'log') %>
-<%= periodically_call_remote(:url => '/logviews/upd', :frequency => '3') %>
+<%= periodically_call_remote(:url => '/logviews/upd', :frequency => '4') %>
 
 <b>This page auto refreshes, please close this page after finished reading</b><br />
 <%= link_to "Mod Changelogs", :controller => :main, :action => :modlogs %><br />

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

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

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

@@ -0,0 +1,3 @@
+$stdout.sync = true
+system "#{ARGV.join(" ")} 2>&1"
+puts "SIX-SHEBANG: #{$?.pid}, #{$?.exitstatus}"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 14
-  - 9
-  version: 0.14.9
+  - 10
+  version: 0.14.10
 platform: ruby
 authors: 
 - Sickboy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 +02:00
+date: 2010-05-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -218,6 +218,7 @@ files:
 - lib/six-updater-web/init.rb
 - lib/six-updater-web/lib/tasks/fixtures.rake
 - lib/six-updater-web/lib/tasks/sync.rake
+- lib/six-updater-web/lib/wrapper.rb
 - lib/six-updater-web/log/production.log
 - lib/six-updater-web/public/404.html
 - lib/six-updater-web/public/422.html