wafris 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc80b768ee486f172f3eb2d617fde7622bff15fca6078819e89ddbae2b112f97
-  data.tar.gz: 6a2528038d9ca8d278ce2a599051e74803635626ee35a67f224bc531d9fa1d7d
+  metadata.gz: 8a2722b928a9589d9a25292b4116200e428fabfbbc7fa7d15e2eaada1a42927a
+  data.tar.gz: c3b941f3ed47136b92731e62df8dbb9d47c29d0817bf85e5b974bcd7b01c9ca8
 SHA512:
-  metadata.gz: a0401a246649e42b5b2f801dae3ae5b362aca9d42446c45e93f3aa8e1c32e23c63b0e065cc8ae6e5f9131be420090d80d72fa5f1d0e85e9cdb9073036657db3b
-  data.tar.gz: 2bf8cf0a8b1a0d13e0aef0c8bd08d869c619b3655b68a4de6a631b60f620212d171be294c9edfcb500bdfb1a856dc3e1fe578815e8d2b0ba6aa1ab9a57fb6324
+  metadata.gz: 8e52e73b5d385e3a81ee4f5845f50dc00cd52683b595db3e5cb4f47ca7e573d49343525b8c2d6de423f9f189752b82f47acb71240d298b509f1da9b72023313e
+  data.tar.gz: b8cb1ccb52d9edc06756f78b277ff4ca2c2c39c94bea68e1e913b74dd620cf8033342759b232cfa086e6cf55f683729258cbb44488eca08f4d821ee751ab1929

data/lib/lua/dist/wafris_core.lua

@@ -67,7 +67,7 @@ local function add_to_graph_timebucket(timebucket, request_id)
   local key = wafris_prefix .. "gr-ct:"
   redis.call("PFADD", key .. timebucket, request_id)
   -- Expire the key after 25 hours if it has no expiry
-  redis.call("EXPIRE", key, 90000, "NX")
+  redis.call("EXPIRE", key, 90000)
 end
 
 -- For: Leaderboard of IPs with Request count as score
@@ -75,7 +75,7 @@ local function increment_timebucket_for(type, timebucket, property)
   local key = wafris_prefix .. type .. "lb:" .. timebucket
   redis.call("ZINCRBY", key, 1, property)
   -- Expire the key after 25 hours if it has no expiry
-  redis.call("EXPIRE", key, 90000, "NX")
+  redis.call("EXPIRE", key, 90000)
 end
 
 local function increment_partial_hourly_request_counters(unix_time_milliseconds)
@@ -85,7 +85,7 @@ local function increment_partial_hourly_request_counters(unix_time_milliseconds)
     local key = wafris_prefix .. "hr-ct:" .. timebucket
     redis.call("INCR", key)
     -- Expire the key after 61 minutes if it has no expiry
-    redis.call("EXPIRE", key, 3660, "NX")
+    redis.call("EXPIRE", key, 3660)
   end
 end
 

data/lib/wafris/configuration.rb

@@ -6,14 +6,22 @@ module Wafris
     attr_accessor :redis_pool_size
 
     def initialize
-      @redis = Redis.new(
-        url: ENV['REDIS_URL'],
-        ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE }
-      )
+      @redis = set_redis
       @redis_pool_size = 20
       set_version
     end
 
+    def set_redis
+      if ENV['REDIS_URL']
+        Redis.new(
+          url: ENV['REDIS_URL'],
+          ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE }
+        )
+      else
+        Redis.new
+      end
+    end
+
     def connection_pool
       @connection_pool ||=
         ConnectionPool.new(size: redis_pool_size) { redis }

data/lib/wafris/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wafris
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wafris
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Micahel Buckbee