perus 0.1.33 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1039bf1d4986cc417fd60adc6ab7a80acc7ccf00
-  data.tar.gz: b68bed313db749d66341f87a8c7b00410e31695b
+  metadata.gz: c02ac4e4ffbf39beae5bfbf6dbe3c0539e10dc3f
+  data.tar.gz: 10247b2d8bf3123aab420b7bdb649d433fc9bbc0
 SHA512:
-  metadata.gz: 72d1dfd9593f9410778bb04eeb4d08e4c73a20a3a52ebc21cf631eb5f74cc411259357c81433c70586a8499a0146da36a10ac5d88a5af74b620123c2e39e072d
-  data.tar.gz: 8b4c711888594c5439bdfa692e3cefcec07dc9f641cdea0c1d356ca1b49fa9d6d9eab0f1aa96114c61624afda92c8e30077d040608d2363ecfd0d9d24c5b29eb
+  metadata.gz: 11e5dde4ad6f3c77bf1601a46ce820792282aeba52c3e672c2b50832cbdd11318b6503f7a8550b4fd652f43551f29a3544c3637a506c45ffc5ae3c5f667440be
+  data.tar.gz: 33c76fca67735b5643cc4521c5c2a8100900bdc21cf4942adf80b3a2a52732aa0ec4282b5ab469267abe42191b0ef317cd2f6588be19d249f61e83b63735ccb0

data/lib/perus/server/app.rb

@@ -157,11 +157,7 @@ module Perus::Server
             timestamp = Time.now.to_i
             ping_params = params.dup
 
-            if request.ip == '127.0.0.1' && ENV['RACK_ENV'] == 'production'
-                system_ip = request.env['HTTP_X_FORWARDED_FOR']
-            else
-                system_ip = request.ip
-            end
+            system_ip = request.env['HTTP_X_FORWARDED_FOR'] || request.ip
 
             Server.ping_queue << Proc.new do
                 # update the system with its last known ip and update time
@@ -193,19 +189,13 @@ module Perus::Server
 
         # config of system based on request ip
         get '/systems/config_for_ip' do
-            ip = nil
+            ip = request.env['HTTP_X_FORWARDED_FOR'] || request.ip
             begin
-                if request.ip == '127.0.0.1' && ENV['RACK_ENV'] == 'production'
-                    ip = request.env['HTTP_X_FORWARDED_FOR']
-                else
-                    ip = request.ip
-                end
-
                 system = System.where(ip: ip).first
                 content_type :json
                 system.config_hash.to_json
             rescue => e
-                puts "\nNo config for: #{ip}\n"
+                STDERR.puts "\nNo config for: #{ip}\n"
                 raise e
             end
         end

data/lib/perus/version.rb

@@ -1,3 +1,3 @@
 module Perus
-    VERSION = "0.1.33"
+    VERSION = "0.1.34"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perus
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.34
 platform: ruby
 authors:
 - Will Cannings