chk
/
AppFlowy-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #232 from AppFlowy-IO/logs/init 

Logs/init
This commit is contained in:
Zack 2023-12-21 07:53:34 -08:00 committed by GitHub
parent 9c9e6b44fd a4e2842d0f
commit bb21e55f9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/application.rs
View File

@ -280,6 +280,7 @@ async fn setup_admin_account(
} }
async fn get_redis_client(redis_uri: &str) -> Result<redis::aio::ConnectionManager, Error> { async fn get_redis_client(redis_uri: &str) -> Result<redis::aio::ConnectionManager, Error> {
info!("Connecting to redis with uri: {}", redis_uri);
let manager = redis::Client::open(redis_uri) let manager = redis::Client::open(redis_uri)
.context("failed to connect to redis")? .context("failed to connect to redis")?
.get_tokio_connection_manager() .get_tokio_connection_manager()
@ -289,6 +290,7 @@ async fn get_redis_client(redis_uri: &str) -> Result<redis::aio::ConnectionManag
} }
async fn get_aws_s3_bucket(s3_setting: &S3Setting) -> Result<s3::Bucket, Error> { async fn get_aws_s3_bucket(s3_setting: &S3Setting) -> Result<s3::Bucket, Error> {
info!("Connecting to S3 bucket with setting: {:?}", &s3_setting);
let region = { let region = {
match s3_setting.use_minio { match s3_setting.use_minio {
true => s3::Region::Custom { true => s3::Region::Custom {
@ -304,7 +306,7 @@ async fn get_aws_s3_bucket(s3_setting: &S3Setting) -> Result<s3::Bucket, Error>
let cred = s3::creds::Credentials { let cred = s3::creds::Credentials {
access_key: Some(s3_setting.access_key.to_owned()), access_key: Some(s3_setting.access_key.to_owned()),
secret_key: Some(s3_setting.secret_key.to_owned()), secret_key: Some(s3_setting.secret_key.expose_secret().to_owned()),
security_token: None, security_token: None,
session_token: None, session_token: None,
expiration: None, expiration: None,
@ -349,6 +351,7 @@ async fn migrate(pool: &PgPool) -> Result<(), Error> {
} }
async fn get_gotrue_client(setting: &GoTrueSetting) -> Result<gotrue::api::Client, Error> { async fn get_gotrue_client(setting: &GoTrueSetting) -> Result<gotrue::api::Client, Error> {
info!("Connecting to GoTrue with setting: {:?}", setting);
let gotrue_client = gotrue::api::Client::new(reqwest::Client::new(), &setting.base_url); let gotrue_client = gotrue::api::Client::new(reqwest::Client::new(), &setting.base_url);
let _ = gotrue_client let _ = gotrue_client
.health() .health()

4
src/config/config.rs
View File

@ -25,7 +25,7 @@ pub struct S3Setting {
pub use_minio: bool, pub use_minio: bool,
pub minio_url: String, pub minio_url: String,
pub access_key: String, pub access_key: String,
pub secret_key: String, pub secret_key: Secret<String>,
pub bucket: String, pub bucket: String,
pub region: String, pub region: String,
} }
@ -114,7 +114,7 @@ pub fn get_configuration() -> Result<Config, anyhow::Error> {
use_minio: get_env_var("APPFLOWY_S3_USE_MINIO", "true").parse()?, use_minio: get_env_var("APPFLOWY_S3_USE_MINIO", "true").parse()?,
minio_url: get_env_var("APPFLOWY_S3_MINIO_URL", "http://localhost:9000"), minio_url: get_env_var("APPFLOWY_S3_MINIO_URL", "http://localhost:9000"),
access_key: get_env_var("APPFLOWY_S3_ACCESS_KEY", "minioadmin"), access_key: get_env_var("APPFLOWY_S3_ACCESS_KEY", "minioadmin"),
secret_key: get_env_var("APPFLOWY_S3_SECRET_KEY", "minioadmin"), secret_key: get_env_var("APPFLOWY_S3_SECRET_KEY", "minioadmin").into(),
bucket: get_env_var("APPFLOWY_S3_BUCKET", "appflowy"), bucket: get_env_var("APPFLOWY_S3_BUCKET", "appflowy"),
region: get_env_var("APPFLOWY_S3_REGION", "us-east-1"), region: get_env_var("APPFLOWY_S3_REGION", "us-east-1"),
}, },