spiderfw 0.6.17 → 0.6.18

data/CHANGELOG

@@ -1,3 +1,11 @@
+= 0.6.18
+== 16 September, 2011
+* Thread management (keeps track of threads to wait for when exiting)
+* Under Phusion Passenger, controller's 'after' is now executed when the response is sent
+* Table widget now accepts a link_id not in the Table's shown elements
+* CLDR fixes
+* Updater fixes
+
 = 0.6.17
 == 13 September, 2011
 * AppManager rewrite, with setup tasks; Migrations

data/VERSION

@@ -1 +1 @@
-0.6.17
+0.6.18

data/apps/core/components/widgets/table/table.shtml

@@ -15,7 +15,7 @@
             <tpl:pass sp:each_index="@rows |row_i|">
                 <tr class="row { (row_i%2==0) ? 'odd' : 'even' }">
                     <td sp:each="@elements |element|">
-                        <a sp:tag-if="@link_el && element == @link_el" href="{ @link }{ Spider::HTTP.urlencode(@rows[row_i][@link_id]) }">
+                        <a sp:tag-if="@link_el && element == @link_el" href="{ @link }{ Spider::HTTP.urlencode(@data[row_i][@link_id]) }">
                             { @rows[row_i][element] }
                         </a>
                     </td>
@@ -46,4 +46,4 @@
     <div sp:if="!@rows || @rows.length < 1" class="no_result">
         _(No element)
     </div>
-</div>
+</div>

data/apps/messenger/config/test.config.yml

@@ -1,7 +1,2 @@
 set test:
-    messenger.email.backend: test
-
-
-apps: 
-- portal
-- demografici
+    messenger.email.backend: test

data/lib/spiderfw/config/options/spider.rb

@@ -30,10 +30,11 @@ module Spider
         :default => Proc.new{ Spider.config.get('runmode') == 'devel' ? true : false }
     config_option 'webserver.port', _("Port to use for the http server"), :type => Fixnum, :default => 8080
     config_option 'webserver.force_threads', _("Force threading on non-threaded adapters"), :type => Spider::DataTypes::Bool,
-        :default => Proc.new{ Spider.runmode != 'test' && RUBY_VERSION_PARTS[1] == '8' && !Object.const_defined?(:PhusionPassenger) ? true : false }
+        :default => Proc.new{ Spider.runmode != 'test' && RUBY_VERSION_PARTS[1] == '8'}
     config_option 'webserver.timeout', _("Time allowed for each request (in seconds)"), :type=> Fixnum, :default => nil
     config_option 'webserver.respawn_on_change', _("Restart the webserver when application code changes"), :type => Spider::Bool,
         :default => Proc.new{ RUBY_PLATFORM !~ /win32|mingw32/ && Spider.config.get('runmode') == 'devel' ? true : false }
+    config_option 'process.shutdown_timeout', _("Number of seconds a process is given to end"), :type => Fixnum, :default => 60
     config_option 'static_content.mode', _("Mode to use for serving static files"), :type => String,
         :choices => [nil, 'x-sendfile', 'x-accel-redirect', 'published'], :default => nil
     config_option 'static_content.auto_publish', _("Automatically publish content to the home's public folder"),

data/lib/spiderfw/http/adapters/rack.rb

@@ -77,8 +77,9 @@ module Spider; module HTTP
             controller_request.action = path
             controller_request.request_time = DateTime.now
 
+            w = nil
             controller_response = Spider::Response.new
-            if (Spider.conf.get('webserver.force_threads'))
+            if Spider.conf.get('webserver.force_threads')
                 r, w = IO.pipe
                 rack_response_hash = {:body => r}
                 controller_response.server_output = RackIO.new(rack_response_hash, controller_response, w)
@@ -89,6 +90,7 @@ module Spider; module HTTP
             end
 
 
+            controller = nil
             controller_done = false
 
             run_block = lambda do
@@ -97,39 +99,59 @@ module Spider; module HTTP
                     controller.extend(Spider::FirstResponder)
                     controller.before(path)
                     controller.execute(path)
+                    if Spider.conf.get('webserver.force_threads')
+                        w.close 
+                        controller_response.server_output.send_headers unless controller_response.server_output.headers_sent?
+                    end
                     controller.after(path)
+                    controller_done = true
                     Spider::Logger.debug("Controller done")
                 rescue => exc
                     Spider.logger.debug("Error:")
                     Spider.logger.debug(exc)
-                    controller.ensure() if controller
+                    controller.ensure if controller
+                    controller = nil
                 ensure
-                    if (Spider.conf.get('webserver.force_threads'))
-                        controller_response.server_output.send_headers unless controller_response.server_output.headers_sent?
-                    else
-                        controller_response.prepare_headers
-                        rack_response_hash[:status] = controller_response.status
-                        rack_response_hash[:headers] = {}
-                        controller_response.headers.each do |key, val|
-                            if (val.is_a?(Array))
-                                val.each{ |v| rack_response_hash[:headers][key] = v.to_s }
-                            else
-                                rack_response_hash[:headers][key] = val.to_s
+                    begin
+                        if Spider.conf.get('webserver.force_threads')
+                            controller_response.server_output.send_headers unless controller_response.server_output.headers_sent?
+                        else
+                            controller_response.prepare_headers
+                            rack_response_hash[:status] = controller_response.status
+                            rack_response_hash[:headers] = {}
+                            controller_response.headers.each do |key, val|
+                                if (val.is_a?(Array))
+                                    val.each{ |v| rack_response_hash[:headers][key] = v.to_s }
+                                else
+                                    rack_response_hash[:headers][key] = val.to_s
+                                end
                             end
+                            w.rewind
+                        end
+                        Spider.request_finished
+                    ensure
+                        if Spider.conf.get('webserver.force_threads')
+                           begin
+                               w.close
+                           rescue
+                           end
+                           Spider.remove_thread(Thread.current)
+                           Thread.exit 
                         end
-                        w.rewind
                     end
-                    controller_done = true
-                    Spider.request_finished
                 end
             end
             
-            if (Spider.conf.get('webserver.force_threads'))
+            if Spider.conf.get('webserver.force_threads')
                 controllerThread = Thread.start &run_block
-                while (!controller_done && !controller_response.server_output.headers_sent?)
+                t = Time.now
+                while !controller_done && !controller_response.server_output.headers_sent? && (Time.now - t) < 60
                     Thread.stop
                 end
-                controllerThread.join
+                if (Time.now - t) >= 60
+                    controllerThread.kill
+                end
+                Spider.add_thread(controllerThread) unless controller_done
             else
                 run_block.call
             end

data/lib/spiderfw/i18n/cldr.rb

@@ -20,14 +20,18 @@ module Spider; module I18n
             time_format = nil
             date_format = nil
             format_string = nil
+            calendar = options[:calendar].to_sym
             if (object.respond_to?(:sec) && !options[:no_time])
-                time_format = @cldr.calendar.timeformats[options[:calendar].to_sym][format.to_s].dup
+                time_format = @cldr.calendar.timeformats[calendar][format.to_s].dup
             end
             if (object.is_a?(Date))
-                date_format = @cldr.calendar.dateformats[options[:calendar].to_sym][format.to_s].dup
+                date_format = @cldr.calendar.dateformats[calendar][format.to_s].dup
             end
             if (date_format && time_format)
-                dt_f = @cldr.calendar.datetimeformats[options[:calendar].to_sym][format.to_s]
+                # in CLDR 1.x, datetimeformats is an hash of strings indexed by strings;
+                # in CLDR 2.x, it is a hash of hashes indexed by symbols
+                fts = @cldr.calendar.datetimeformats[calendar] || @cldr.calendar.datetimeformats[calendar.to_s]
+                dt_f = fts.is_a?(String) ? fts : fts[format.to_s] 
                 format_string = dt_f.sub('{1}', date_format).sub('{0}', time_format)
             else
                 format_string = date_format ? date_format : time_format
@@ -137,17 +141,36 @@ module Spider; module I18n
         
         def week_start(calendar = self.default_calendar)
             wdays = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat']
-            wdays.index @cldr.calendar.week_firstdays[calendar.to_s]
+            day = if @cldr.respond_to?(:supplemental)
+                @cldr.supplemental.week_data["firstDay"]
+            elsif @cldr.calendar.respond_to?(:week_firstdays) # CLDR 1
+                @cldr.calendar.week_firstdays[calendar.to_s]
+            end
+            day ||= 'mon'
+            wdays.index day
+            
         end
         
         def weekend_start(calendar = self.default_calendar)
             wdays = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat']
-            wdays.index @cldr.calendar.weekend_starts[calendar.to_s]
+            day = if @cldr.respond_to?(:supplemental)
+                @cldr.supplemental.week_data["weekendStart"]
+            elsif @cldr.calendar.respond_to?(:weekend_starts) # CLDR 1
+                @cldr.calendar.weekend_starts[calendar.to_s]
+            end
+            day ||= 'sat'
+            wdays.index day
         end
         
         def weekend_end(calendar = self.default_calendar)
             wdays = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat']
-            wdays.index @cldr.calendar.weekend_ends[calendar.to_s]
+            day = if @cldr.respond_to?(:supplemental)
+                @cldr.supplemental.week_data["weekendEnd"]
+            elsif @cldr.calendar.respond_to?(:weekend_ends) # CLDR 1
+                @cldr.calendar.weekend_ends[calendar.to_s]
+            end
+            day ||= 'sun'
+            wdays.index day
         end
         
         def localize_number(object, precision=nil, options={})
@@ -195,4 +218,4 @@ module Spider; module I18n
         
     end
     
-end; end
+end; end

data/lib/spiderfw/setup/app_manager.rb

@@ -62,8 +62,8 @@ module Spider
         
         def self.get_apps(apps, options={})
             specs = resolve(apps, options)
-            manager = self.new(options)
-            manager.install(specs)
+            manager = self.new
+            manager.install(specs, options)
             return specs
         end
 
@@ -181,9 +181,11 @@ module Spider
             tmp_path = File.join(self.tmp_path, "update-#{DateTime.now.strftime('%Y%m%d-%H%M')}")
             @backup_path = tmp_path
             FileUtils.mkdir_p(tmp_path)
+            @previous_apps = {}
             specs.each do |spec|
                 app_path = File.join(@home_path, 'apps', spec.id)
                 FileUtils.cp_r(app_path, tmp_path)
+                @previous_apps[spec.app_id] = App::AppSpec.load(File.join(app_path, "#{spec.id}.appspec"))
             end
         end
         
@@ -193,7 +195,7 @@ module Spider
             Spider.init_base
             @done_tasks = {}
             specs.each do |spec|
-                prev_spec = Spider.home.apps[spec.app_id][:spec]
+                prev_spec = @previous_apps[spec.app_id]
                 prev_v = prev_spec.version if prev_spec
                 @done_tasks[spec.app_id] = setup(spec.app_id, prev_v, spec.version)
             end

data/lib/spiderfw/spider.rb

@@ -8,6 +8,7 @@ require 'spiderfw/autoload'
 require 'spiderfw/requires'
 
 require 'spiderfw/version'
+require 'timeout'
 
 begin
     require 'fssm'
@@ -218,6 +219,23 @@ module Spider
             end
             @shutdown_done = true
             Spider.logger.debug("Shutdown")
+            if @running_threads
+                begin
+                    Timeout.timeout(Spider.conf.get('process.shutdown_timeout')) do
+                        @running_threads.each do |thr|
+                            thr.join if thr.alive?
+                        end
+                    end
+                rescue => exc
+                    Spider.logger.error(exc)
+                    @running_threads.each do |thr|
+                        begin
+                            thr.kill
+                        rescue => exc
+                        end
+                    end
+                end
+            end
             Debugger.post_mortem = false if Object.const_defined?(:Debugger) && Debugger.post_mortem?
             @apps.each do |name, mod|
                 mod.app_shutdown if mod.respond_to?(:app_shutdown)
@@ -230,6 +248,20 @@ module Spider
         def shutdown!
             shutdown(true)
         end
+
+        def add_thread(thr)
+            @running_threads ||= []
+            @threads_mutex ||= Mutex.new
+            @threads_mutex.synchronize do
+                @running_threads << thr
+            end
+        end
+
+        def remove_thread(thr)
+            @threads_mutex.synchronize do
+                @running_threads.delete(thr)
+            end
+        end
         
         def main_process_shutdown
             if startup_done?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 35
   prerelease: 
   segments: 
   - 0
   - 6
-  - 17
-  version: 0.6.17
+  - 18
+  version: 0.6.18
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-13 00:00:00 +02:00
+date: 2011-09-16 00:00:00 +02:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency