Skip to content

Commit

Permalink
fixup! Add script to run tests / add to CI job; add optional config p…
Browse files Browse the repository at this point in the history 
…arams for queue and cache redis DSNs
  • Loading branch information
@jaymell
jaymell committed Apr 22, 2022
1 parent 94679bb commit 744c70c
Show file tree
Hide file tree
Showing 3 changed files with 91 additions and 96 deletions.
93 changes: 45 additions & 48 deletions server/svix-server/src/core/cache.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,22 +166,21 @@ mod tests {
let cfg = crate::cfg::load().unwrap();

// FIXME -- move this to a helper method
let redis_cache = match cfg.cache_type {
CacheType::Redis => {
let mgr = crate::redis::create_redis_pool(
cfg.redis_dsn.as_ref().expect("Redis DSN not found"),
false,
)
.await;
Some(mgr)
}
CacheType::RedisCluster => {
let mgr = crate::redis::create_redis_pool(
cfg.redis_dsn.as_ref().expect("Redis DSN not found"),
true,
)
.await;
Some(mgr)
let redis_cache = {
let redis_dsn = cfg
.cache_redis_dsn
.as_ref()
.or(cfg.redis_dsn.as_ref())
.expect("Redis DSN not found");
match cfg.cache_type {
CacheType::Redis => {
let mgr = crate::redis::create_redis_pool(redis_dsn, false).await;
Some(mgr)
}
CacheType::RedisCluster => {
let mgr = crate::redis::create_redis_pool(redis_dsn, true).await;
Some(mgr)
}
}
};
let cache = RedisCache::new(redis_cache.unwrap());
Expand Down Expand Up @@ -237,22 +236,21 @@ mod tests {
let cfg = crate::cfg::load().unwrap();

// FIXME -- move this to a helper method
let redis_cache = match cfg.cache_type {
CacheType::Redis => {
let mgr = crate::redis::create_redis_pool(
cfg.redis_dsn.as_ref().expect("Redis DSN not found"),
false,
)
.await;
Some(mgr)
}
CacheType::RedisCluster => {
let mgr = crate::redis::create_redis_pool(
cfg.redis_dsn.as_ref().expect("Redis DSN not found"),
true,
)
.await;
Some(mgr)
let redis_cache = {
let redis_dsn = cfg
.cache_redis_dsn
.as_ref()
.or(cfg.redis_dsn.as_ref())
.expect("Redis DSN not found");
match cfg.cache_type {
CacheType::Redis => {
let mgr = crate::redis::create_redis_pool(redis_dsn, false).await;
Some(mgr)
}
CacheType::RedisCluster => {
let mgr = crate::redis::create_redis_pool(redis_dsn, true).await;
Some(mgr)
}
}
};
let cache = RedisCache::new(redis_cache.unwrap());
Expand All @@ -273,22 +271,21 @@ mod tests {
let cfg = crate::cfg::load().unwrap();

// FIXME -- move this to a helper method
let redis_cache = match cfg.cache_type {
CacheType::Redis => {
let mgr = crate::redis::create_redis_pool(
cfg.redis_dsn.as_ref().expect("Redis DSN not found"),
false,
)
.await;
Some(mgr)
}
CacheType::RedisCluster => {
let mgr = crate::redis::create_redis_pool(
cfg.redis_dsn.as_ref().expect("Redis DSN not found"),
true,
)
.await;
Some(mgr)
let redis_cache = {
let redis_dsn = cfg
.cache_redis_dsn
.as_ref()
.or(cfg.redis_dsn.as_ref())
.expect("Redis DSN not found");
match cfg.cache_type {
CacheType::Redis => {
let mgr = crate::redis::create_redis_pool(redis_dsn, false).await;
Some(mgr)
}
CacheType::RedisCluster => {
let mgr = crate::redis::create_redis_pool(redis_dsn, true).await;
Some(mgr)
}
}
};
let cache = RedisCache::new(redis_cache.unwrap());
Expand Down
62 changes: 30 additions & 32 deletions server/svix-server/src/core/idempotency.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,22 +393,21 @@ mod tests {
let cfg = crate::cfg::load().unwrap();

// FIXME -- move this to a helper method
let redis_cache = match cfg.cache_type {
CacheType::Redis => {
let mgr = crate::redis::create_redis_pool(
cfg.redis_dsn.as_ref().expect("Redis DSN not found"),
false,
)
.await;
Some(mgr)
}
CacheType::RedisCluster => {
let mgr = crate::redis::create_redis_pool(
cfg.redis_dsn.as_ref().expect("Redis DSN not found"),
true,
)
.await;
Some(mgr)
let redis_cache = {
let redis_dsn = cfg
.cache_redis_dsn
.as_ref()
.or(cfg.redis_dsn.as_ref())
.expect("Redis DSN not found");
match cfg.cache_type {
CacheType::Redis => {
let mgr = crate::redis::create_redis_pool(redis_dsn, false).await;
Some(mgr)
}
CacheType::RedisCluster => {
let mgr = crate::redis::create_redis_pool(redis_dsn, true).await;
Some(mgr)
}
}
};
let cache = RedisCache::new(redis_cache.unwrap());
Expand Down Expand Up @@ -614,22 +613,21 @@ mod tests {
let cfg = crate::cfg::load().unwrap();

// FIXME -- move this to a helper method
let redis_cache = match cfg.cache_type {
CacheType::Redis => {
let mgr = crate::redis::create_redis_pool(
cfg.redis_dsn.as_ref().expect("Redis DSN not found"),
false,
)
.await;
Some(mgr)
}
CacheType::RedisCluster => {
let mgr = crate::redis::create_redis_pool(
cfg.redis_dsn.as_ref().expect("Redis DSN not found"),
true,
)
.await;
Some(mgr)
let redis_cache = {
let redis_dsn = cfg
.cache_redis_dsn
.as_ref()
.or(cfg.redis_dsn.as_ref())
.expect("Redis DSN not found");
match cfg.cache_type {
CacheType::Redis => {
let mgr = crate::redis::create_redis_pool(redis_dsn, false).await;
Some(mgr)
}
CacheType::RedisCluster => {
let mgr = crate::redis::create_redis_pool(redis_dsn, true).await;
Some(mgr)
}
}
};
let cache = RedisCache::new(redis_cache.unwrap());
Expand Down
32 changes: 16 additions & 16 deletions server/svix-server/src/redis/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,22 +126,22 @@ mod tests {
let cfg = crate::cfg::load().unwrap();

// FIXME -- move this to a helper method
let pool = match cfg.cache_type {
CacheType::Redis => {
let mgr = crate::redis::create_redis_pool(
cfg.redis_dsn.as_ref().expect("Redis DSN not found"),
false,
)
.await;
mgr
}
CacheType::RedisCluster => {
let mgr = crate::redis::create_redis_pool(
cfg.redis_dsn.as_ref().expect("Redis DSN not found"),
true,
)
.await;
mgr
let pool = {
let redis_dsn = cfg
.cache_redis_dsn
.as_ref()
.or(cfg.redis_dsn.as_ref())
.expect("Redis DSN not found");

match cfg.cache_type {
CacheType::Redis => {
let mgr = crate::redis::create_redis_pool(redis_dsn, false).await;
mgr
}
CacheType::RedisCluster => {
let mgr = crate::redis::create_redis_pool(redis_dsn, true).await;
mgr
}
}
};

Expand Down

0 comments on commit 744c70c

Please sign in to comment.