dango 0.3.1 → 0.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -116,6 +116,12 @@ module DangoFrameworkModule
116
116
  puts str if $VERBOSE
117
117
  end
118
118
 
119
+ # エラー出力用のメソッド
120
+ def error_print(str)
121
+ logger.error str
122
+ puts str
123
+ end
124
+
119
125
  # ロガーの定義
120
126
  def logger
121
127
  # if !@dango_logger # これだと警告が出てうざいので
@@ -161,52 +161,50 @@ class DangoServerFramework
161
161
 
162
162
  # サーバー開始処理
163
163
  def server_start()
164
- set_server_variables() # 各種サーバー仕様の変数設定
165
-
166
- logger.warn("===== server initialize =====") # loggerの準備
167
- logger.warn("network_port=#{@network_port}")
168
- logger.warn("network_host=#{@network_host}")
169
- logger.warn("server_host=#{@server_host}")
170
- logger.warn("max_connections=#{@server_max_connections}")
171
- logger.warn("RAILS_ENV=#{RAILS_ENV}")
172
- logger.warn("Process.pid=#{Process.pid}")
173
- logger.warn("Dango Version=#{Dango::VERSION::STRING}")
164
+ begin
165
+ set_server_variables() # 各種サーバー仕様の変数設定
166
+
167
+ logger.warn("===== server initialize =====") # loggerの準備
168
+ logger.warn("network_port=#{@network_port}")
169
+ logger.warn("network_host=#{@network_host}")
170
+ logger.warn("server_host=#{@server_host}")
171
+ logger.warn("max_connections=#{@server_max_connections}")
172
+ logger.warn("RAILS_ENV=#{RAILS_ENV}")
173
+ logger.warn("Process.pid=#{Process.pid}")
174
+ logger.warn("Dango Version=#{Dango::VERSION::STRING}")
174
175
  # logger.debug("$LOADED_FEATURES=#{$LOADED_FEATURES.pretty_inspect}")
175
176
 
176
- @session_manager = SessionManager.new # セッション情報の初期化
177
- shared_init() # 共有メモリを初期化
178
- socket_list_init() # ソケット一覧を初期化
179
- mutex_socket_list_init() # ソケット毎用のmutexを初期化
180
- @mutex_proc_thread = Mutex.new # スレッドが同時起動しないようにするためのMutex
181
- dango_server_init() # 初期設定読み込み
182
- heart_beat_thread_start() # ハートビートスレッドの開始
183
- gc_thread_start() # GCスレッドの開始
177
+ @session_manager = SessionManager.new # セッション情報の初期化
178
+ shared_init() # 共有メモリを初期化
179
+ socket_list_init() # ソケット一覧を初期化
180
+ mutex_socket_list_init() # ソケット毎用のmutexを初期化
181
+ @mutex_proc_thread = Mutex.new # スレッドが同時起動しないようにするためのMutex
182
+ heart_beat_thread_start() # ハートビートスレッドの開始
183
+ gc_thread_start() # GCスレッドの開始
184
184
 
185
- @mutex_send_response = Mutex.new # 送信レスポンス用のMutex
186
- @arr_send_response = [] # 送信レスポンス用のキャッシュ
185
+ dango_server_init() # 初期設定読み込み
187
186
 
188
- TCPSocket.do_not_reverse_lookup = true # 逆引きを行わない
189
- # TCPSocket.do_not_reverse_lookup = false # 逆引きを行う
187
+ @mutex_send_response = Mutex.new # 送信レスポンス用のMutex
188
+ @arr_send_response = [] # 送信レスポンス用のキャッシュ
189
+
190
+ TCPSocket.do_not_reverse_lookup = true # 逆引きを行わない
191
+ # TCPSocket.do_not_reverse_lookup = false # 逆引きを行う
190
192
 
191
- @gserver = DangoGServer.new(self, @network_port, @server_host, @server_max_connections)
192
- @gserver.audit = true # Turn logging on.
193
- @gserver.debug = true # debug
193
+ @gserver = DangoGServer.new(self, @network_port, @server_host, @server_max_connections)
194
+ @gserver.audit = true # Turn logging on.
195
+ @gserver.debug = true # debug
194
196
 
195
- if @gserver_log_file && @gserver_log_file != ""
196
197
  gserver_log_fh = open(@gserver_log_file, "a")
197
198
  @gserver.stdlog = gserver_log_fh
198
- end
199
-
200
- GC.disable
201
-
202
- open(@pid_file, "wb"){|fh| fh.write Process.pid.to_s } # pidをファイルに保存
203
-
204
- begin
199
+
200
+ GC.disable
201
+ open(@pid_file, "wb"){|fh| fh.write Process.pid.to_s } # pidをファイルに保存
202
+
205
203
  @gserver.start
204
+
206
205
  rescue Exception
207
- error_msg = "#{$!.class} #{$!.message} #{$!.backtrace.pretty_inspect}"
208
- logger.error error_msg
209
- puts error_msg
206
+ error_print("#{error_message($!, 'u')}")
207
+ exit
210
208
  end
211
209
  end
212
210
 
@@ -246,7 +244,7 @@ class DangoServerFramework
246
244
  begin
247
245
  load f[:file]
248
246
  rescue Exception
249
- debug_print("#{$!.class} #{$!.message} #{$!.backtrace.pretty_inspect}")
247
+ debug_print("#{error_message($!, 'u')}")
250
248
  end
251
249
  end
252
250
 
@@ -257,7 +255,7 @@ class DangoServerFramework
257
255
  server_start() # サーバー開始
258
256
  end
259
257
  rescue Exception
260
- logger.error "#{$!.class}:#{$!.message}\n#{$!.backtrace.pretty_inspect}"
258
+ error_print("#{error_message($!, 'u')}")
261
259
  end
262
260
  end
263
261
 
data/lib/dango/version.rb CHANGED
@@ -2,7 +2,7 @@ module Dango #:nodoc:
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 0
4
4
  MINOR = 3
5
- TINY = 1
5
+ TINY = 2
6
6
 
7
7
  STRING = [MAJOR, MINOR, TINY].join('.')
8
8
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dango
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.1
4
+ version: 0.3.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Keisuke Minami
@@ -9,11 +9,12 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2008-06-20 00:00:00 +09:00
12
+ date: 2008-06-26 00:00:00 +09:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rake
17
+ type: :runtime
17
18
  version_requirement:
18
19
  version_requirements: !ruby/object:Gem::Requirement
19
20
  requirements:
@@ -23,6 +24,7 @@ dependencies:
23
24
  version:
24
25
  - !ruby/object:Gem::Dependency
25
26
  name: dango_generator
27
+ type: :runtime
26
28
  version_requirement:
27
29
  version_requirements: !ruby/object:Gem::Requirement
28
30
  requirements:
@@ -88,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
88
90
  requirements: []
89
91
 
90
92
  rubyforge_project: dango
91
- rubygems_version: 1.1.1
93
+ rubygems_version: 1.2.0
92
94
  signing_key:
93
95
  specification_version: 2
94
96
  summary: Realtime communications network framework for Ruby and Flash on Rails.