dango 0.0.2 → 0.0.3

data/lib/dango/framework_base.rb

@@ -143,7 +143,7 @@ module DangoFrameworkModule
     
     dtype, size = size_str[0, 5].unpack("cN")
     
-    raise(DangoFrameworkError, "size=0:size_str=#{size_str.inspect}") if size == 0
+    raise(DangoFrameworkConnectionError, "size=#{size}:size_str=#{size_str.inspect}") if size == nil || size == 0
     
 #    cs_logger.debug "size=#{size}:size_str=#{size_str.inspect}"
     
@@ -184,7 +184,7 @@ module DangoFrameworkModule
         data = Marshal.load(ret_data)
       end
     rescue
-      raise(DangoFrameworkError, "data parse error.\nret_data=#{ret_data}")
+      raise(DangoFrameworkConnectionError, "data parse error.\nret_data=#{ret_data}")
     end
   end
   

data/lib/dango/server_framework.rb

@@ -210,12 +210,12 @@ class DangoServerFramework
           break
         end
         
-#        cs_logger.debug "start cs_receive_data"
         ret_obj = nil
-#        mutex_socket_list.synchronize(session[:session_id]) do
+        begin
           ret_obj = cs_receive_data(sock) # データ受信処理
-#        end
-#        cs_logger.debug "finished cs_receive_data"
+        rescue
+          
+        end
         
         if ret_obj != {} # 受信データがあれば
           if !(ret_obj && ret_obj["action"]) # actionが無い場合はエラー
@@ -248,6 +248,9 @@ class DangoServerFramework
       @recv_fail_count += 1 if @recv_fail_count # 受信失敗回数カウント
       cs_logger.debug "connection error. \n#{error_message($!, 'u')}"
       
+    rescue DangoFrameworkError
+      cs_logger.debug "DangoFrameworkError. \n#{error_message($!, 'u')}"
+      
     rescue Exception
       cs_logger.error "#{error_message($!, 'u')}"
       
@@ -478,12 +481,12 @@ class DangoServerFramework
 #    end
     def synchronize(key)
       raise("not exist key(#{key})") if ! @msl_hash.has_key?(key) 
-      @cs_logger.debug("mutex_socket_list starting synchronize. key=#{key}")
+#      @cs_logger.debug("mutex_socket_list starting synchronize. key=#{key}")
       ret = nil
       @msl_hash[key].synchronize do
-        @cs_logger.debug("mutex_socket_list started synchronize. key=#{key}")
+#        @cs_logger.debug("mutex_socket_list started synchronize. key=#{key}")
         ret = yield
-        @cs_logger.debug("mutex_socket_list finished synchronize. key=#{key}")
+#        @cs_logger.debug("mutex_socket_list finished synchronize. key=#{key}")
       end
       ret
     end
@@ -522,6 +525,8 @@ class DangoServerFramework
   def cs_server_send_data(session_id, notice_name, send_obj, options = {})
     cs_logger.debug "cs_server_send_data(#{session_id.inspect}, #{notice_name.inspect}, #{send_obj.inspect}, #{options.inspect})"
     
+    raise(DangoFrameworkError, "send_obj is not Hash.") if ! send_obj.is_a?(Hash)
+    
     timeout = options[:timeout] || 6
     dtype = options[:type] || 0
     
@@ -548,7 +553,7 @@ class DangoServerFramework
           # 戻ってきたデータのチェック
           notice_name_sym = (notice_name.class == Symbol) ? (":"+notice_name.to_s) : ('"'+notice_name+'"')
           instance_method_name = "cs_receive_response_#{notice_name}"
-          cs_logger.debug "instance_eval notice_name_sym=" + notice_name_sym.inspect
+#          cs_logger.debug "instance_eval notice_name_sym=" + notice_name_sym.inspect
           expr = <<-EOF
             def self.#{instance_method_name}(ret_obj)
               begin

data/lib/dango/version.rb

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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: dango
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2007-09-27 00:00:00 +09:00
+  version: 0.0.3
+date: 2007-09-28 00:00:00 +09:00
 summary: Ruby - Flash conneciton network flamework
 require_paths: 
 - lib