finally done of in-app 'database' module

This commit is contained in:
Brandon Thomas committed 2022-02-19 03:42:39 -05:00
1 parent 598e99d2da
commit c4b8e0912a
11 files changed
+13 -18

No files matched your search

+1
View File
@@ -6,6 +6,7 @@ pub mod api_tokens;
pub mod column_types;
pub mod helpers;
pub mod ip_bans;
pub mod mediators;
pub mod model_categories;
pub mod tokens;
pub mod tts;
@@ -1,6 +1,6 @@
use anyhow::anyhow;
use container_common::anyhow_result::AnyhowResult;
use crate::database::mediators::firehose_publisher::FirehosePublisher;
use crate::mediators::firehose_publisher::FirehosePublisher;
use log::{warn,info};
use sqlx::error::Error::Database;
use sqlx::mysql::MySqlQueryResult;
@@ -1,6 +1,6 @@
use anyhow::anyhow;
use container_common::anyhow_result::AnyhowResult;
use database_queries::tokens::Tokens;
use crate::tokens::Tokens;
use log::{warn,info};
use sqlx::error::Error::Database;
use sqlx::mysql::MySqlQueryResult;
@@ -1 +0,0 @@
pub mod mediators;
+2 -3
View File
@@ -15,7 +15,6 @@
pub const RESERVED_USERNAMES : &'static str = include_str!("../../../../db/reserved_usernames.txt");
pub const RESERVED_SUBSTRINGS : &'static str = include_str!("../../../../db/reserved_usernames_including.txt");
pub mod database;
pub mod common_env;
pub mod http_clients;
pub mod http_server;
@@ -43,8 +42,6 @@ use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING;
use config::shared_constants::DEFAULT_RUST_LOG;
use container_common::anyhow_result::AnyhowResult;
use crate::common_env::CommonEnv;
use crate::database::mediators::badge_granter::BadgeGranter;
use crate::database::mediators::firehose_publisher::FirehosePublisher;
use crate::http_server::endpoints::events::list_events::list_events_handler;
use crate::http_server::endpoints::leaderboard::get_leaderboard::leaderboard_handler;
use crate::http_server::endpoints::misc::default_route_404::default_route_404;
@@ -112,6 +109,8 @@ use crate::threads::poll_ip_banlist_thread::poll_ip_bans;
use crate::util::buckets::bucket_client::BucketClient;
use crate::util::caching::single_item_ttl_cache::SingleItemTtlCache;
use crate::util::encrypted_sort_id::SortKeyCrypto;
use database_queries::mediators::badge_granter::BadgeGranter;
use database_queries::mediators::firehose_publisher::FirehosePublisher;
use futures::Future;
use http_server_common::cors::build_common_cors_config;
use limitation::Limiter;
@@ -1,5 +1,3 @@
use crate::database::mediators::badge_granter::BadgeGranter;
use crate::database::mediators::firehose_publisher::FirehosePublisher;
use crate::http_server::endpoints::tts::list_tts_models::TtsModelRecordForResponse;
use crate::http_server::web_utils::cookie_manager::CookieManager;
use crate::http_server::web_utils::redis_rate_limiter::RedisRateLimiter;
@@ -8,6 +6,8 @@ use crate::threads::ip_banlist_set::IpBanlistSet;
use crate::util::buckets::bucket_client::BucketClient;
use crate::util::caching::single_item_ttl_cache::SingleItemTtlCache;
use crate::util::encrypted_sort_id::SortKeyCrypto;
use database_queries::mediators::badge_granter::BadgeGranter;
use database_queries::mediators::firehose_publisher::FirehosePublisher;
use r2d2_redis::{r2d2, RedisConnectionManager};
use sqlx::MySqlPool;
@@ -11,7 +11,6 @@
#[macro_use] extern crate serde_derive;
pub mod common_env;
pub mod database;
pub mod job_queries;
pub mod script_execution;
pub mod util;
@@ -22,8 +21,6 @@ use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING;
use config::shared_constants::DEFAULT_RUST_LOG;
use container_common::anyhow_result::AnyhowResult;
use crate::common_env::CommonEnv;
use crate::database::mediators::badge_granter::BadgeGranter;
use crate::database::mediators::firehose_publisher::FirehosePublisher;
use crate::job_queries::tts_download_job_queries::TtsUploadJobRecord;
use crate::job_queries::tts_download_job_queries::grab_job_lock_and_mark_pending;
use crate::job_queries::tts_download_job_queries::insert_tts_model;
@@ -44,6 +41,8 @@ use crate::util::noop_logger::NoOpLogger;
use crate::util::redis::redis_job_status_logger::RedisJobStatusLogger;
use data_encoding::{HEXUPPER, HEXLOWER, HEXLOWER_PERMISSIVE};
use database_queries::column_types::tts_model_type::TtsModelType;
use database_queries::mediators::badge_granter::BadgeGranter;
use database_queries::mediators::firehose_publisher::FirehosePublisher;
use log::{warn, info};
use r2d2_redis::RedisConnectionManager;
use r2d2_redis::r2d2;
@@ -11,7 +11,6 @@
#[macro_use] extern crate serde_derive;
pub mod common_env;
pub mod database;
pub mod http_clients;
pub mod job_queries;
pub mod script_execution;
@@ -24,7 +23,6 @@ use config::shared_constants::DEFAULT_RUST_LOG;
use container_common::anyhow_result::AnyhowResult;
use container_common::token::random_uuid::generate_random_uuid;
use crate::common_env::CommonEnv;
use crate::database::mediators::firehose_publisher::FirehosePublisher;
use crate::http_clients::tts_inference_sidecar_client::TtsInferenceSidecarClient;
use crate::script_execution::tacotron_inference_command::TacotronInferenceCommand;
use crate::util::buckets::bucket_client::BucketClient;
@@ -45,6 +43,7 @@ use crate::util::redis::redis_job_status_logger::RedisJobStatusLogger;
use crate::util::semi_persistent_cache_dir::SemiPersistentCacheDir;
use data_encoding::{HEXUPPER, HEXLOWER, HEXLOWER_PERMISSIVE};
use database_queries::column_types::vocoder_type::VocoderType;
use database_queries::mediators::firehose_publisher::FirehosePublisher;
use database_queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::{AvailableTtsInferenceJob, list_available_tts_inference_jobs};
use database_queries::tts::tts_inference_jobs::mark_tts_inference_job_done::mark_tts_inference_job_done;
use database_queries::tts::tts_inference_jobs::mark_tts_inference_job_failure::mark_tts_inference_job_failure;
@@ -11,7 +11,6 @@
#[macro_use] extern crate serde_derive;
pub mod common_env;
pub mod database;
pub mod job_queries;
pub mod script_execution;
pub mod util;
@@ -22,8 +21,6 @@ use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING;
use config::shared_constants::DEFAULT_RUST_LOG;
use container_common::anyhow_result::AnyhowResult;
use crate::common_env::CommonEnv;
use crate::database::mediators::badge_granter::BadgeGranter;
use crate::database::mediators::firehose_publisher::FirehosePublisher;
use crate::job_queries::w2l_download_job_queries::W2lTemplateUploadJobRecord;
use crate::job_queries::w2l_download_job_queries::grab_job_lock_and_mark_pending;
use crate::job_queries::w2l_download_job_queries::insert_w2l_template;
@@ -46,6 +43,8 @@ use crate::util::hashing::hash_file_sha2::hash_file_sha2;
use crate::util::noop_logger::NoOpLogger;
use crate::util::redis::redis_job_status_logger::RedisJobStatusLogger;
use data_encoding::{HEXUPPER, HEXLOWER, HEXLOWER_PERMISSIVE};
use database_queries::mediators::badge_granter::BadgeGranter;
use database_queries::mediators::firehose_publisher::FirehosePublisher;
use log::{warn, info};
use r2d2_redis::RedisConnectionManager;
use r2d2_redis::r2d2;
@@ -11,7 +11,6 @@
#[macro_use] extern crate serde_derive;
pub mod common_env;
pub mod database;
pub mod job_queries;
pub mod script_execution;
pub mod util;
@@ -22,7 +21,6 @@ use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING;
use config::shared_constants::DEFAULT_RUST_LOG;
use container_common::anyhow_result::AnyhowResult;
use crate::common_env::CommonEnv;
use crate::database::mediators::firehose_publisher::FirehosePublisher;
use crate::job_queries::w2l_inference_job_queries::W2lInferenceJobRecord;
use crate::job_queries::w2l_inference_job_queries::get_w2l_template_by_token;
use crate::job_queries::w2l_inference_job_queries::grab_job_lock_and_mark_pending;
@@ -47,6 +45,7 @@ use crate::util::noop_logger::NoOpLogger;
use crate::util::redis::redis_job_status_logger::RedisJobStatusLogger;
use crate::util::semi_persistent_cache_dir::SemiPersistentCacheDir;
use data_encoding::{HEXUPPER, HEXLOWER, HEXLOWER_PERMISSIVE};
use database_queries::mediators::firehose_publisher::FirehosePublisher;
use log::{warn, info};
use r2d2_redis::RedisConnectionManager;
use r2d2_redis::r2d2::PooledConnection;