Made org ratios more accurate

monitor.go

@@ -41,9 +41,20 @@ func (m Monitor) Check(sessionData *SessionState, key string) {
 	usagePerc = (float64(remainder) / float64(sessionData.QuotaMax)) * 100.0
 
 	log.Debug("Perc is: ", usagePerc)
+	RenewalDate := time.Unix(sessionData.QuotaRenews, 0)
+
+	log.Debug("Now is: ", time.Now())
+	log.Debug("Renewal is: ", RenewalDate)
+	if time.Now().After(RenewalDate) {
+		// Make sure that renewal is still in the future, If renewal is in the past,
+		// then the quota can expire and will auto-renew
+		log.Debug("Renewal date is in the past, skipping")
+		return
+	}
 
 	if config.Monitor.GlobalTriggerLimit > 0.0 {
 		if usagePerc >= config.Monitor.GlobalTriggerLimit {
+			log.Info("Firing...")
 			m.Fire(sessionData, key, config.Monitor.GlobalTriggerLimit)
 		}
 	}
@@ -52,6 +63,7 @@ func (m Monitor) Check(sessionData *SessionState, key string) {
 		if usagePerc >= triggerLimit {
 
 			if triggerLimit != config.Monitor.GlobalTriggerLimit {
+				log.Info("Firing...")
 				m.Fire(sessionData, key, triggerLimit)
 				break
 			}

redis_cluster_handler.go

@@ -246,7 +246,7 @@ func (r *RedisClusterStorageManager) IncrememntWithExpire(keyName string, expire
 		log.Debug("Incremented key: ", fixedKey, ", val is: ", val)
 		if val == 1 {
 			log.Debug("--> Setting Expire")
-			r.db.Send("EXPIRE", fixedKey, expire)
+			r.db.Do("EXPIRE", fixedKey, expire)
 		}
 		if err != nil {
 			log.Error("Error trying to increment value:", err)

session_manager.go

@@ -181,6 +181,7 @@ func (l SessionLimiter) IsRedisQuotaExceeded(currentSession *SessionState, key s
 	log.Debug("[QUOTA] Inbound raw key is: ", key)
 	rawKey := QuotaKeyPrefix + publicHash(key)
 	log.Debug("[QUOTA] Quota limiter key is: ", rawKey)
+	log.Debug("Renewing with TTL: ", currentSession.QuotaRenewalRate)
 	// INCR the key (If it equals 1 - set EXPIRE)
 	qInt := store.IncrememntWithExpire(rawKey, currentSession.QuotaRenewalRate)