ocean-rails 7.0.3 → 7.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55ee0d2e59d628299a0b7c3d1b5736d20a2c7378
-  data.tar.gz: 1954c7bbf968b5cfc53a66acb9763a840853107e
+  metadata.gz: c688e729d2c1b39ad3bdfa4784e9a2a592ac1fdb
+  data.tar.gz: 4b48fa1e6101bd8a33c88a56fc13adf941176aa5
 SHA512:
-  metadata.gz: 78b5ccb8d16d7451f3499d475ed2171efbc13251e32f1b1b07dc226fd800aaf80842bfa77d4b0c57f742c2aa99fff167421a69e75c897a5c6ee9a50df77f1553
-  data.tar.gz: 33ca5a629222de0b358e924caec26ffe26a3f179d982a2f43e3345c6e139ef75b94bfea6a826e37a8e0905af5562c1fcc7d7df897c699791238cdee864df4678
+  metadata.gz: 1be2f8a525ada27bd029d04e98c86e60571da22ce080008a7a228fcbee3313f711e69d33a5b3b1210df3738e14ecac1de0ae918ae431057882e9810001896d67
+  data.tar.gz: ab9b7ba1613a4617bb5e5336d51d5f2e21a95e27e102c4fc1069c9760cfb4ef91566013aaac51019c24e96842f6fbcde0047355dbaa7aa8e70fb6ae24857ae14

data/lib/ocean-rails.rb

@@ -6,10 +6,12 @@ require "ocean/api_resource"
 require "ocean/ocean_resource_model" if defined? ActiveRecord || defined? OceanDynamo
 require "ocean/ocean_resource_controller" if defined? ActionController
 require "ocean/ocean_application_controller"
-require "ocean/zero_log"
-require "ocean/zeromq_logger"
-require "ocean/selective_rack_logger"
-require "ocean/flooding"
+if ENV['RAILS_ENV'] == "production" && ENV['NO_ZEROMQ_LOGGING'].blank?
+  puts "YAAAAAAAS"
+  require "ocean/zero_log" 
+  require "ocean/zeromq_logger"
+  require "ocean/selective_rack_logger"
+end
 require "ocean/api_remote_resource"
 
 require "aws-sdk-v1"  # Remove later
@@ -23,17 +25,19 @@ UUID_REGEX = /([0-9a-f]+-){4}[0-9a-f]+/
 
 module Ocean
 
-  class Railtie < Rails::Railtie
-    # Silence the /alive action
-    initializer "ocean.swap_logging_middleware" do |app|
-      app.middleware.swap Rails::Rack::Logger, SelectiveRackLogger
+  if ENV['RAILS_ENV'] == "production" && ENV['NO_ZEROMQ_LOGGING'].blank?
+    class Railtie < Rails::Railtie
+      # Silence the /alive action
+      initializer "ocean.swap_logging_middleware" do |app|
+        app.middleware.swap Rails::Rack::Logger, SelectiveRackLogger
+      end
+      # Make sure the generators use the gem's templates first
+      config.app_generators do |g|
+        g.templates.unshift File::expand_path('../templates', __FILE__)
+      end 
     end
-    # Make sure the generators use the gem's templates first
-    config.app_generators do |g|
-      g.templates.unshift File::expand_path('../templates', __FILE__)
-    end 
   end
-  
+
 end
 
 

data/lib/ocean/selective_rack_logger.rb

@@ -1,7 +1,6 @@
 #
 # This custom Rack middleware is used to turn off logging of requests made to
-# <code>/alive</code> by Varnish every 15 seconds in order to detect 
-# failing instances for failover purposes.
+# <code>/alive</code>.
 #
 class SelectiveRackLogger < Rails::Rack::Logger
 

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "7.0.3"
+  VERSION = "7.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 7.0.3
+  version: 7.0.4
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -264,7 +264,6 @@ files:
 - lib/ocean/api_remote_resource.rb
 - lib/ocean/api_resource.rb
 - lib/ocean/engine.rb
-- lib/ocean/flooding.rb
 - lib/ocean/ocean_application_controller.rb
 - lib/ocean/ocean_resource_controller.rb
 - lib/ocean/ocean_resource_model.rb

data/lib/ocean/flooding.rb

@@ -1,29 +0,0 @@
-# # Rack::Attack.blacklist('block 1.2.3.4') do |req|
-# #   true
-# # end
-
-# Rack::Attack.blacklisted_response = lambda do |env|
-#   [ 403, {}, ['Blacklisted']]
-# end
-
-
-# Rack::Attack.throttle('req/ip', :limit => 1000, :period => 1.second) do |req|
-#   # If the return value is truthy, the cache key for the return value
-#   # is incremented and compared with the limit. In this case:
-#   #   "rack::attack:#{Time.now.to_i/1.second}:req/ip:#{req.ip}"
-#   # We might want to use the token value instead of the #{req.ip} value.
-#   # (IPs may be shared, tokens never are.)
-#   #
-#   # If falsy, the cache key is neither incremented nor checked.
-#   req.ip
-# end
-
-# Rack::Attack.throttled_response = lambda do |env|
-#   allowed =     env['rack.attack.match_data'][:limit]
-#   t =           env['rack.attack.match_data'][:period].inspect
-#   made =        env['rack.attack.match_data'][:count]
-#   retry_after = env['rack.attack.match_data'][:period] rescue nil
-#   [ 429, 
-#     {'Retry-After' => retry_after.to_s}, 
-#     ["Too Many Requests. You have exceeded your quota of #{allowed} request(s)/#{t} by #{made - allowed}."]]
-# end