facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 06:47:41 +03:00
Code Issues Projects Releases Wiki Activity

dynamicconfig: bust cached config when vpnless config changes

Browse Source 
Summary: Compare file mtimes so we synchronously regenerate dynamic config if the user has modified /etc/mercurial/vpnless. This way things will work off-VPN immediately after writing "1" to /etc/mercurial/vpnless.

Reviewed By: evangrayk

Differential Revision: D44263217

fbshipit-source-id: 1f09591336b7dc1294e1f21fafebce7962859d70
This commit is contained in:
Muir Manders 2023-03-23 22:17:29 -07:00 committed by Facebook GitHub Bot
parent 2a8cae6908
commit c0dcb56428
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
eden/scm/lib/config/loader/src/hg.rs
View File

@ -389,6 +389,8 @@ impl ConfigSetHgExt for ConfigSet {
use util::run_background;
use crate::fb::dynamicconfig::vpnless_config_path;
let mut errors = Vec::new();
// Compute path
@ -406,9 +408,14 @@ impl ConfigSetHgExt for ConfigSet {
let this_version = ::version::VERSION;
let vpnless_changed = match (dynamic_path.metadata(), vpnless_config_path().metadata()) {
(Ok(d), Ok(v)) => v.modified()? > d.modified()?,
_ => false,
};
// Synchronously generate the new config if it's out of date with our version
if version != Some(this_version) {
tracing::info!(?dynamic_path, file_version=?version, my_version=%this_version, "regenerating dynamic config (version mismatch)");
if version != Some(this_version) || vpnless_changed {
tracing::info!(?dynamic_path, file_version=?version, my_version=%this_version, vpnless_changed, "regenerating dynamic config (version mismatch)");
let (repo_name, user_name) = {
let mut temp_config = ConfigSet::new();
if !temp_config.load_user(opts.clone(), identity).is_empty() {