fix rate limiter package

This commit is contained in:
Brandon Thomas committed 2021-09-11 04:43:17 -04:00
1 parent 591d828da3
commit d359427e42
8 files changed
+11 -8

No files matched your search

File renamed without changes.
+1
View File
@@ -1,6 +1,7 @@
pub mod cookie_manager;
pub mod ip_address;
pub mod read_multipart_field_bytes;
pub mod redis_rate_limiter;
pub mod response_error_helpers;
pub mod response_success_helpers;
pub mod serialize_as_json_error;
@@ -1,3 +1,6 @@
//! NB: This doesn't live in the `util.redis` package because it depends on `http_server`.
//! It's only used for the server anyway, so living here makes sense.
use actix_http::http::{HeaderName, HeaderMap};
use actix_web::HttpRequest;
use crate::http_server::web_utils::ip_address::get_request_ip;
+3 -3
View File
@@ -16,8 +16,8 @@ pub const RESERVED_USERNAMES : &'static str = include_str!("../db/reserved_usern
pub const RESERVED_SUBSTRINGS : &'static str = include_str!("../db/reserved_usernames_including.txt");
pub const BANNED_SLURS : &'static str = include_str!("../db/banned_slurs.txt");
pub mod clients;
pub mod database;
pub mod http_clients;
pub mod http_server;
pub mod server_state;
pub mod shared_constants;
@@ -90,6 +90,7 @@ use crate::http_server::endpoints::w2l::list_w2l_templates::list_w2l_templates_h
use crate::http_server::endpoints::w2l::set_w2l_template_mod_approval::set_w2l_template_mod_approval_handler;
use crate::http_server::middleware::ip_filter_middleware::IpFilter;
use crate::http_server::web_utils::cookie_manager::CookieManager;
use crate::http_server::web_utils::redis_rate_limiter::RedisRateLimiter;
use crate::http_server::web_utils::session_checker::SessionChecker;
use crate::server_state::{ServerState, EnvConfig};
use crate::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING;
@@ -99,9 +100,9 @@ use crate::threads::ip_banlist_set::IpBanlistSet;
use crate::threads::poll_ip_banlist_thread::poll_ip_bans;
use crate::util::buckets::bucket_client::BucketClient;
use crate::util::encrypted_sort_id::SortKeyCrypto;
use crate::util::redis::redis_rate_limiter::RedisRateLimiter;
use futures::Future;
use futures::executor::ThreadPool;
use limitation::Limiter;
use log::{info};
use r2d2_redis::RedisConnectionManager;
use r2d2_redis::r2d2;
@@ -110,7 +111,6 @@ use sqlx::MySqlPool;
use sqlx::mysql::MySqlPoolOptions;
use std::sync::Arc;
use std::time::Duration;
use limitation::Limiter;
// TODO TODO TODO TODO
// TODO TODO TODO TODO
+1 -1
View File
@@ -1,11 +1,11 @@
use crate::database::mediators::badge_granter::BadgeGranter;
use crate::database::mediators::firehose_publisher::FirehosePublisher;
use crate::http_server::web_utils::cookie_manager::CookieManager;
use crate::http_server::web_utils::redis_rate_limiter::RedisRateLimiter;
use crate::http_server::web_utils::session_checker::SessionChecker;
use crate::threads::ip_banlist_set::IpBanlistSet;
use crate::util::buckets::bucket_client::BucketClient;
use crate::util::encrypted_sort_id::SortKeyCrypto;
use crate::util::redis::redis_rate_limiter::RedisRateLimiter;
use r2d2_redis::{r2d2, RedisConnectionManager};
use sqlx::MySqlPool;
+2 -2
View File
@@ -10,9 +10,9 @@
#[macro_use] extern crate serde_derive;
pub mod clients;
pub mod common_env;
pub mod database;
pub mod http_clients;
pub mod job_queries;
pub mod script_execution;
pub mod shared_constants;
@@ -20,10 +20,10 @@ pub mod util;
use anyhow::{anyhow, Error};
use chrono::{Utc, DateTime, TimeZone};
use crate::clients::tts_inference_sidecar_client::TtsInferenceSidecarClient;
use crate::common_env::CommonEnv;
use crate::database::enums::vocoder_type::VocoderType;
use crate::database::mediators::firehose_publisher::FirehosePublisher;
use crate::http_clients::tts_inference_sidecar_client::TtsInferenceSidecarClient;
use crate::job_queries::tts_inference_job_queries::get_tts_model_by_token;
use crate::job_queries::tts_inference_job_queries::grab_job_lock_and_mark_pending;
use crate::job_queries::tts_inference_job_queries::insert_tts_result;
+1 -2
View File
@@ -1,3 +1,2 @@
pub mod redis_job_status_logger;
pub mod redis_keys;
pub mod redis_rate_limiter;
pub mod redis_keys;