HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix (backend-rs): use cache server if present

Browse source
This commit is contained in:
naskya 2024-04-20 06:53:34 +09:00
parent b157cbe79a
commit b017f9ce94
No known key found for this signature in database
GPG key ID: 712D413B3A9FED5C
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
packages/backend-rs/src/database/redis.rs
View file

@ -7,15 +7,21 @@ fn init_redis() -> Result<Client, RedisError> {
let redis_url = {
let mut params = vec!["redis://".to_owned()];
if let Some(user) = &CONFIG.redis.user {
let redis = if let Some(cache_server) = &CONFIG.cache_server {
cache_server
} else {
&CONFIG.redis
};
if let Some(user) = &redis.user {
params.push(user.to_string())
}
if let Some(pass) = &CONFIG.redis.pass {
if let Some(pass) = &redis.pass {
params.push(format!(":{}@", pass))
}
params.push(CONFIG.redis.host.to_string());
params.push(format!(":{}", CONFIG.redis.port));
params.push(format!("/{}", CONFIG.redis.db));
params.push(redis.host.to_string());
params.push(format!(":{}", redis.port));
params.push(format!("/{}", redis.db));
params.concat()
};
@ -31,9 +37,9 @@ pub fn redis_conn() -> Result<Connection, RedisError> {
}
#[inline]
/// prefix redis key with the hostname
pub fn key(key: &str) -> String {
format!("{}:{}", CONFIG.hostname, key)
/// prefix redis key
pub fn key(key: impl ToString) -> String {
format!("{}:{}", CONFIG.redis.prefix, key.to_string())
}
#[cfg(test)]