dango 0.0.39 → 0.1.0

data/lib/dango/client_framework.rb

@@ -173,6 +173,7 @@ class DangoClientFramework
   # 接続直後のsid通知なら
   def dango_receive__notice_sid(rec_obj)
     @sid = rec_obj["_sid"]
+    logger.info "sid=#{@sid}"
   end
   
   # システムからのメッセージ通知なら

data/lib/dango/monitor/dango_monitor_client.rb

@@ -39,6 +39,7 @@ class DangoMonitorClient < DangoClientFramework
     logger.debug "DangoMonitorClient:#{monitor_action_name}:#{ENV['RAILS_ROOT']}"
     begin
       ret_obj = send_action_return_notice("_monitor_#{monitor_action_name}", {})
+      logger.debug "get_server_info_common:ret_obj=#{ret_obj.inspect}"
       raise("code is not 0 (faild). :code=#{ret_obj['code']}") if ret_obj['code'] != 0
       return(ret_obj[monitor_action_name])
     rescue DangoFrameworkConnectionError

data/lib/dango/server_framework.rb

@@ -107,12 +107,14 @@ class DangoServerFramework
     
     # SIGINT の捕捉
     Signal.trap(:INT) do 
+      logger.warn "SIGINT\n#{caller(0).pretty_inspect}"
       stop_gserver() # gserverの停止
       exit_process() # プロセス終了処理
     end
     
     # 終了処理を登録しておく(これが無いとWindowsではエラーが出てもプロセスが落ちないことがある)
     at_exit do
+      logger.error "at_exit ERROR\n#{caller(0).pretty_inspect}"
       stop_gserver() # gserverの停止
       exit_process() # プロセス終了処理
     end
@@ -307,7 +309,13 @@ class DangoServerFramework
         
         if is_flash_policy_file && @policy_file_request # Flashのポリシーファイルが来たら
           logger.info "is_flash_policy_file #{sid} "
-          policy_data = '<?xml version="1.0"?><cross-domain-policy><allow-access-from domain="*" to-ports="*" /></cross-domain-policy>' + "\0" + "\n"
+          policy_data = <<EOF
+<?xml version="1.0"?>
+<cross-domain-policy>
+<allow-access-from domain="*" to-ports="*" />
+</cross-domain-policy>
+EOF
+          policy_data += "\0" + "\n"
           logger.debug policy_data
           sock.write policy_data
           sock.flush
@@ -390,11 +398,10 @@ class DangoServerFramework
           end
           
           logger.info "#{sock.inspect} #{sid} is closed"
-          
-          session_del()
         end
       end
       
+      session_del() # @mutex_proc_thread.synchronizeの中だとうまくいかない
     end
   end
   
@@ -578,8 +585,12 @@ class DangoServerFramework
 #    @session[sid]
   end
   def session_del # セッション情報の初期化
-    @session_list.delete(Thread.current.object_id)
+    begin
+      @session_list.delete(Thread.current.object_id)
 #    @session_th_list.delete(Thread.current)
+    rescue Exception
+      logger.error "ERROR\n#{error_message($!, 'u')}"
+    end
   end
   
   attr_reader(:session_list)
@@ -629,21 +640,21 @@ class DangoServerFramework
         begin
           sleep @gc_interval_sec
           
-          Thread.critical = true
+#          Thread.critical = true
           logger.debug "GC start "
           gc_start_time = Time.now
           GC.enable
           GC.start 
           GC.disable
           logger.debug "GC end #{Time.now - gc_start_time}sec "
-          Thread.critical = false
+#          Thread.critical = false
           
         rescue Exception
           logger.error "Exception gc_thread_start  #{error_message($!, 'u')}"
         end
       end
     end
-    th.priority = -1
+    th.priority = 3
   end
   
   # ハートビートスレッドの開始
@@ -797,10 +808,11 @@ class DangoServerFramework
                   if Time.now > end_reserved_time
                     logger.debug "send_notice:receive timeout:#{notice_name} #{sid}  #{end_reserved_time}" 
                     
-#                    if notice_name.to_s == "_heart_beat" # heart beatだったらsockを止める
-#                      logger.info "!!!! send_notice:heart_beat timeout" 
-#                      sock.close if !sock.closed?
-#                    end
+                    # このコードは不要なはずだが念の為取っておいてある、安定したことが確認できたら削除する
+                    if notice_name.to_s == "_heart_beat" # heart beatだったらsockを止める
+                      logger.info "!!!! send_notice:heart_beat timeout" 
+                      sock.close if !sock.closed?
+                    end
                     break
                   end
                   

data/lib/dango/version.rb

@@ -1,8 +1,8 @@
 module Dango #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 0
-    TINY  = 39
+    MINOR = 1
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dango
 version: !ruby/object:Gem::Version 
-  version: 0.0.39
+  version: 0.1.0
 platform: ""
 authors: 
 - Keisuke Minami
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-01 00:00:00 +09:00
+date: 2007-12-08 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +21,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: dango_generator
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.0
+    version: 
 description: Realtime communications network framework for Ruby and Flash on Rails.
 email: keisuke@rccn.com
 executables: []