logs-cf-plugin 0.0.30.pre → 0.0.31.pre

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODUzNzJmODQxZWE1N2VjODk2MjJlYWIzMTcxOGMxOGE1NTdiYmY3Ng==
+    ZjQ1OTkwNmMxZTU1ODM2ODNhMTcyYmJlOTZmMjQ4MGM3OWYwMmMyYg==
   data.tar.gz: !binary |-
-    ZDMzMTk2NDA0M2M1ZDMwZDA4NjliNDI1NTY4Yzc2MzBkYWZjMTY2NA==
+    NzVmMDcwOGNmOWFmN2Q0ZTg5YTAyNjI1OGMyZTI1YTVkMTc0NWZmMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2Y2NWQ4MjA4Y2RjZGUzNjM2ZGZmOTI4MDE1MzE0MTBhNTQ2MjAwMWM1NzU0
-    YjgzYTRiNGU2NjAyMmZmMjNiMzg5MzE1ZjM2MjRmYTRkNmZmYWIxNzZjMWU1
-    MThlN2VjZGIwMTI5MDlmNjRmMGM0NjFkMzRhNzU3NGVkZmYxYTk=
+    NTU4NTA4MGI1Y2I1MDg2ODllZTUyYmE4YzFkMWI2OThiMzk5YTAyNTgxYzE2
+    OWZlODdhMTgwMzg4YTNlYTY0NTZmN2IyODkwNDJkYjhkOTg5NDU4MmRmYzdh
+    YTFlOTk1M2IzYzUwNzM2NWU2MTcyNjBjYTQ4MTk1N2QxMTJlYmU=
   data.tar.gz: !binary |-
-    MzM2ZmQ2YjJiZjRmZjZhNmM1MjFkZTZhMjJiYjczMWEzYmQxMDJiOTFmZDkx
-    YWVjN2Q1NTI1YjdiNmZkZWIwYTA4ODgzMjVkMDdlYmFiOWIyNmNjM2E4ZDVh
-    ZDU3YzM5OTBmZGJmMzZkYzA5MWRmODUwMzZkYTc3M2ZjYzYwMjg=
+    OTJjYThiODc5ZWYyNmE3ZTk4YTI0NjI0OWMzZjg3YmIxOTdlNmVkMmQ2YmM5
+    ODdhYTBlM2ViNjZmYzc5ZDIwZTI5NjQ5NGRmMzhmNDZjNWNiOTAxNzUyNWVi
+    NDliODE4NTdjYWY3YWMxMTc2MzY2NmM2MjNiZDgyMjczZmU3ZGM=

data/lib/logs-cf-plugin/ip_lookup.rb

@@ -0,0 +1,25 @@
+require 'socket'
+
+module IpLookup
+  def self.best_ip_info
+    ip = (my_first_public_ipv4 || my_first_private_ipv4)
+    ip && ip.ip_address
+  end
+
+  private
+
+  def self.my_first_private_ipv4
+    Socket.ip_address_list.detect do |intf|
+      intf.ipv4_private?
+    end
+  end
+
+  def self.my_first_public_ipv4
+    Socket.ip_address_list.detect do |intf|
+      intf.ipv4? and
+          !intf.ipv4_loopback? and
+          !intf.ipv4_multicast? and
+          !intf.ipv4_private?
+    end
+  end
+end

data/lib/logs-cf-plugin/loggregator_client.rb

@@ -1,9 +1,3 @@
-require 'loggregator_messages'
-require 'faye/websocket'
-require 'eventmachine'
-require 'uri'
-require 'logs-cf-plugin/message_writer'
-
 module LogsCfPlugin
   class LoggregatorClient
     include CFoundry::TraceHelpers
@@ -21,7 +15,7 @@ module LogsCfPlugin
       output.puts "websocket_address: #{websocket_address}" if trace
 
       EM.run {
-        ws = Faye::WebSocket::Client.new(websocket_address, nil, :headers => {"Origin" => "http://localhost", "Authorization" => user_token})
+        ws = Faye::WebSocket::Client.new(websocket_address, nil, :headers => {"Origin" => IpLookup.best_ip_info, "Authorization" => user_token})
 
         ws.on :open do |event|
           output.puts("Connected to server.")

data/lib/logs-cf-plugin/plugin.rb

@@ -1,9 +1,14 @@
 require 'cf'
+require 'eventmachine'
+require 'faye/websocket'
+require 'loggregator_messages'
+require 'uri'
 
 module LogsCfPlugin
-  require 'logs-cf-plugin/loggregator_client'
+  require 'logs-cf-plugin/ip_lookup'
   require 'logs-cf-plugin/log_target'
   require 'logs-cf-plugin/message_writer'
+  require 'logs-cf-plugin/loggregator_client'
 
   class Plugin < CF::CLI
     include LoginRequirements

metadata

@@ -1,33 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: logs-cf-plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.30.pre
+  version: 0.0.31.pre
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 4.2.5
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 4.2.5
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -79,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/logs-cf-plugin/ip_lookup.rb
 - lib/logs-cf-plugin/log_target.rb
 - lib/logs-cf-plugin/loggregator_client.rb
 - lib/logs-cf-plugin/message_writer.rb