diff options
| author | Rhenium <rhenium@rhe.jp> | 2013-12-10 17:14:30 +0900 |
|---|---|---|
| committer | Rhenium <rhenium@rhe.jp> | 2013-12-10 17:14:30 +0900 |
| commit | ca675144c137f2884340caadef31b4e2613ac314 (patch) | |
| tree | 2986a43c7c9f7549e2a26e7112fb5ff56fa5ca11 | |
| parent | dc68b53a9f04583f365e1a2a4945a28e9478ab6e (diff) | |
| download | aclog-ca675144c137f2884340caadef31b4e2613ac314.tar.gz | |
update collector
| -rw-r--r-- | collector/settings.yml.example | 2 | ||||
| -rw-r--r-- | lib/aclog/receiver/collector_connection.rb | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/collector/settings.yml.example b/collector/settings.yml.example index f2b44f4..6100b3b 100644 --- a/collector/settings.yml.example +++ b/collector/settings.yml.example @@ -7,12 +7,10 @@ defaults: &defaults secret_key: "secret key" development: <<: *defaults - worker_number: 0 receiver_host: localhost receiver_port: 42106 production: <<: *defaults - worker_number: <%= ENV["ACLOG_WORKER_NUMBER"] %> receiver_host: localhost receiver_port: 42106 diff --git a/lib/aclog/receiver/collector_connection.rb b/lib/aclog/receiver/collector_connection.rb index 30c119c..b45afc3 100644 --- a/lib/aclog/receiver/collector_connection.rb +++ b/lib/aclog/receiver/collector_connection.rb @@ -92,15 +92,16 @@ module Aclog def receive_init(msg) secret_key = msg["secret_key"] - worker_number = msg["worker_number"] unless secret_key == Settings.collector.secret_key - Rails.logger.warn("Invalid secret_key(?:#{worker_number}): \"#{secret_key}\"") + Rails.logger.warn("Invalid secret_key: \"#{secret_key}\"") send_object(type: "fatal", message: "Invalid secret_key") close_connection_after_writing return end - if worker_number > Settings.collector.count - Rails.logger.warn("Invalid worker_number: #{worker_number}, secret_key: \"#{secret_key}\"") + + worker_number = Settings.collector.count.times.find {|num| !@connections.key?(num) } + if worker_number == nil + Rails.logger.warn("Invalid worker_number: #{worker_number}") send_object(type: "fatal", message: "Invalid worker_number") close_connection_after_writing return |