Commit 94f4728a authored by Ian Jackson's avatar Ian Jackson
Browse files

ApplicationConfig: abolish accessor

parent 85cf744e

crates/arti/src/cfg.rs

+1 −8
Original line number Diff line number Diff line
@@ -28,14 +28,7 @@ pub struct ApplicationConfig { 
    /// recreated, or for some other reason).

    #[serde(default)]

    #[builder(default)]

    watch_configuration: bool,

}



impl ApplicationConfig {

    /// Return true if we're configured to watch for configuration changes.

    pub fn watch_configuration(&self) -> bool {

        self.watch_configuration

    }

    pub(crate) watch_configuration: bool,

}



/// Configuration for one or more proxy listeners.

crates/arti/src/lib.rs

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ pub async fn run<R: Runtime>( 
        .config(client_config)

        .bootstrap_behavior(OnDemand)

        .create_unbootstrapped()?;

    if arti_config.application().watch_configuration() {

    if arti_config.application().watch_configuration {

        watch_cfg::watch_for_config_changes(config_sources, arti_config, client.clone())?;

    }

crates/arti/src/watch_cfg.rs

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ fn reconfigure<R: Runtime>( 
    let client_config = config.tor_client_config()?;

    client.reconfigure(&client_config, Reconfigure::WarnOnFailures)?;



    if !config.application().watch_configuration() {

    if !config.application().watch_configuration {

        // Stop watching for configuration changes.

        return Ok(true);

    }