Fix antenna migration for redis servers with password protection

This commit is contained in:
Namekuji 2023-08-01 12:52:00 -04:00 committed by Laura Hausmann
parent 04a1bd9363
commit 3f7d26a0e3
No known key found for this signature in database
GPG key ID: D044E84C5BE01605

View file

@ -42,13 +42,15 @@ async fn main() {
None => "redis", None => "redis",
Some(_) => "rediss", Some(_) => "rediss",
}; };
let redis_uri_userpass = match redis_conf.user { let redis_user = redis_conf.user.unwrap_or("default".to_string());
None => "".to_string(), let redis_uri_userpass = format!(
Some(user) => format!("{}:{}@", user, encode(&redis_conf.pass.unwrap_or_default())), "{}:{}",
}; redis_user,
encode(&redis_conf.pass.unwrap_or_default())
);
let redis_uri_hostport = format!("{}:{}", redis_conf.host, redis_conf.port); let redis_uri_hostport = format!("{}:{}", redis_conf.host, redis_conf.port);
let redis_uri = format!( let redis_uri = format!(
"{}://{}{}/{}", "{}://{}@{}/{}",
redis_proto, redis_uri_userpass, redis_uri_hostport, redis_conf.db redis_proto, redis_uri_userpass, redis_uri_hostport, redis_conf.db
); );
env::set_var(CACHE_URL_ENV, redis_uri); env::set_var(CACHE_URL_ENV, redis_uri);