From b017f9ce94a4c4678468f570958458106cb5a088 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 20 Apr 2024 06:53:34 +0900
Subject: [PATCH] fix (backend-rs): use cache server if present
---
packages/backend-rs/src/database/redis.rs | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/packages/backend-rs/src/database/redis.rs b/packages/backend-rs/src/database/redis.rs
index 863f57b35d..8652c6b53c 100644
--- a/packages/backend-rs/src/database/redis.rs
+++ b/packages/backend-rs/src/database/redis.rs
@@ -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)]