mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
memcache: don't panic if Memcache fails to initialize
Summary: Simply return an error when that happens. Reviewed By: dtolnay Differential Revision: D20808660 fbshipit-source-id: 94ca1c6de5739e4e67f2db6be547ed92c5696e43
This commit is contained in:
parent
a156633c1f
commit
29727102db
@ -38,7 +38,7 @@ impl CacheManager {
|
||||
}?;
|
||||
|
||||
Ok(CacheManager {
|
||||
memcache: MemcacheClient::new(fb).into(),
|
||||
memcache: MemcacheClient::new(fb)?.into(),
|
||||
cachelib: cachelib.into(),
|
||||
keygen: KeyGen::new(Self::KEY_PREFIX, Self::MC_CODEVER, Self::MC_SITEVER),
|
||||
})
|
||||
|
@ -138,7 +138,7 @@ impl MemcacheOps {
|
||||
|
||||
Ok(Self {
|
||||
lease_type,
|
||||
memcache: MemcacheClient::new(fb),
|
||||
memcache: MemcacheClient::new(fb)?,
|
||||
keygen: KeyGen::new(blob_key, MC_CODEVER, MC_SITEVER),
|
||||
presence_keygen: KeyGen::new(presence_key, MC_CODEVER, MC_SITEVER),
|
||||
hostname,
|
||||
|
@ -71,7 +71,9 @@ impl CachingBonsaiHgMapping {
|
||||
Self {
|
||||
mapping,
|
||||
cache_pool: cache_pool.into(),
|
||||
memcache: MemcacheClient::new(fb).into(),
|
||||
memcache: MemcacheClient::new(fb)
|
||||
.expect("Memcache initialization failed")
|
||||
.into(),
|
||||
keygen: CachingBonsaiHgMapping::create_key_gen(),
|
||||
}
|
||||
}
|
||||
|
@ -68,7 +68,9 @@ impl CachingChangesets {
|
||||
Self {
|
||||
changesets,
|
||||
cachelib: cache_pool.into(),
|
||||
memcache: MemcacheClient::new(fb).into(),
|
||||
memcache: MemcacheClient::new(fb)
|
||||
.expect("Memcache initialization failed")
|
||||
.into(),
|
||||
keygen: get_keygen(),
|
||||
}
|
||||
}
|
||||
|
@ -141,7 +141,9 @@ impl MemcacheCache {
|
||||
};
|
||||
|
||||
Self {
|
||||
memcache: MemcacheHandler::from(MemcacheClient::new(fb)),
|
||||
memcache: MemcacheHandler::from(
|
||||
MemcacheClient::new(fb).expect("Memcache initialization failed"),
|
||||
),
|
||||
keygen: KeyGen::new(key_prefix, MC_CODEVER as u32, mc_sitever),
|
||||
}
|
||||
}
|
||||
|
@ -45,7 +45,7 @@ impl SqlPhasesFactory {
|
||||
) -> Self {
|
||||
let key_prefix = "scm.mononoke.phases";
|
||||
let caches = Caches {
|
||||
memcache: MemcacheClient::new(fb),
|
||||
memcache: MemcacheClient::new(fb).expect("Memcache initialization failed"),
|
||||
keygen: KeyGen::new(key_prefix, MC_CODEVER, MC_SITEVER),
|
||||
cache_pool: cache_pool.into(),
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user