active_statsd 0.1.0.1 → 0.1.0.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 65a1d95ad8e6bb84ddaa3ebfdbdebf0f2e22461690f7600c8ddffdfd4e285d49
4
- data.tar.gz: 6678ff948cb67c06d9d577186de57ebfc06b2d6cbe46ef42a7d35daea5e2e803
3
+ metadata.gz: 2d6a863b23d647b528f8b3bd62c1f37537e389b9042674454012f8908878ec0c
4
+ data.tar.gz: b81303f0442c397650344875d61aee68738f30a6f5c87643b0886075076c423d
5
5
  SHA512:
6
- metadata.gz: 32d76aaf7d39d8f9f89c7097da9a6ed184388044ab9f087e0ab5882b4df125f879a18d7dda19f53b12840f50d7daf18285f0753ece6c679d93a18a1865c85cd2
7
- data.tar.gz: f4fae172b244f3913fb1a380993848396d91b3b7e625a78d25b4b944d573dd2faf20b320bc8a74025f11eaad620bb2904113a1916f9d6a223b1c0358d6a80466
6
+ metadata.gz: 4bfc3764aaccf595f1391e46b3eae23a98ec56af933098f4d6f66673883f26077c03d34838e330b33c3f3f0d7f4790ebc1916bc9402dfc4d18b483eb0a1e1cdb
7
+ data.tar.gz: 723aff4bf12e0b4facc5a15fbb8b205ab767c6bb7e545d2f8277c94a4939c0a75792628b866a99b2970fe6555b027e1e7328a553cd46b17c4669f4278d1f3057
@@ -12,20 +12,34 @@ module ActiveStatsD
12
12
  @counters = Hash.new(0)
13
13
  @mutex = Mutex.new
14
14
  @forward_socket = UDPSocket.new if forwarding_enabled?
15
+ @running = false
15
16
  end
16
17
 
17
18
  def start
18
- start_aggregation_thread if aggregation_enabled?
19
+ return if @running # Don't attempt to start twice
19
20
 
20
21
  Thread.new do
22
+ begin
23
+ sockets = Socket.udp_server_sockets(@host, @port)
24
+ rescue Errno::EADDRINUSE
25
+ Rails.logger.warn "[ActiveStatsD] Server already running on #{@host}:#{@port}, skipping startup."
26
+ next
27
+ end
28
+
29
+ @running = true
21
30
  Rails.logger.info "[ActiveStatsD] UDP StatsD listener started on #{@host}:#{@port} (aggregation=#{@aggregation})"
31
+ start_aggregation_thread if aggregation_enabled?
32
+
22
33
  begin
23
- Socket.udp_server_loop(@host, @port) do |msg, _|
34
+ Socket.udp_server_loop_on(sockets) do |msg, _|
24
35
  Rails.logger.debug "[ActiveStatsD] UDP packet received: #{msg.strip}"
25
36
  handle_message(msg.strip)
26
37
  end
27
38
  rescue => e
28
39
  Rails.logger.error "[ActiveStatsD] Server error: #{e.class.name} - #{e.message}\n#{e.backtrace.join("\n")}"
40
+ ensure
41
+ sockets.each(&:close)
42
+ @running = false
29
43
  end
30
44
  end
31
45
  end
@@ -34,17 +48,10 @@ module ActiveStatsD
34
48
 
35
49
  def handle_message(message)
36
50
  metric, value, type = parse_metric(message)
37
-
38
51
  return unless metric && type == 'c'
39
52
 
40
- if aggregation_enabled?
41
- @mutex.synchronize { @counters[metric] += value }
42
- end
43
-
44
- if forwarding_enabled?
45
- forward_message(message)
46
- end
47
-
53
+ @mutex.synchronize { @counters[metric] += value } if aggregation_enabled?
54
+ forward_message(message) if forwarding_enabled?
48
55
  log_message(metric, value, type) unless aggregation_enabled?
49
56
  end
50
57
 
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module ActiveStatsd
4
- VERSION = "0.1.0.1"
4
+ VERSION = "0.1.0.2"
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: active_statsd
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0.1
4
+ version: 0.1.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mike Poage