about summary refs log tree commit homepage
path: root/lib/raindrops/linux.rb
diff options
context:
space:
mode:
authorBrian Corrigan <brian@genexp.me>2012-06-05 11:46:34 -0400
committerEric Wong <normalperson@yhbt.net>2012-06-05 17:16:38 -0700
commit15dea14dd4e1af97aef928430c3c8ef8c5d74451 (patch)
tree4f0af6016b8ee1914f9a41933c9ea391c8649a24 /lib/raindrops/linux.rb
parent3a7387205dd5791a443215ae6b365865e0eacfa3 (diff)
downloadraindrops-15dea14dd4e1af97aef928430c3c8ef8c5d74451.tar.gz
Raindrops currently fails when provided a symlink to a socket.
As this is a common practice for many deployment tools (Vlad,
etc.) this patch adds support for finding the realpath prior to
looking the socket up in /proc/net/unix

[ew: commit message subject]

[ew: fixed test to pass under 1.9.3 and 1.8.7:
* Tempfile#unlink is unsafe to call if we want to reuse the
  path, use File.unlink(tmp.path) instead

* The return value of File.symlink is zero (or it raises),
  so it's unusable.

* File.symlink will not call #to_path under 1.8.7, so it's
  necessary to pass pathnames to it, not Tempfile objects.
]

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'lib/raindrops/linux.rb')
-rw-r--r--lib/raindrops/linux.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/raindrops/linux.rb b/lib/raindrops/linux.rb
index fe2af09..a198253 100644
--- a/lib/raindrops/linux.rb
+++ b/lib/raindrops/linux.rb
@@ -8,6 +8,8 @@
 # Instead of snapshotting, Raindrops::Aggregate::LastDataRecv may be used
 # to aggregate statistics from +all+ accepted sockets as they arrive
 # based on the +last_data_recv+ field in Raindrops::TCP_Info
+require 'pathname'
+
 module Raindrops::Linux
 
   # The standard proc path for active UNIX domain sockets, feel free to call
@@ -41,6 +43,7 @@ module Raindrops::Linux
     else
       paths = paths.map do |path|
         path = path.dup
+        path = Pathname.new(path).realpath.to_s
         path.force_encoding(Encoding::BINARY) if defined?(Encoding)
         rv[path]
         Regexp.escape(path)