Skip to content

Commit a327fb1

Browse files
committed
Add configuration
1 parent 97fa267 commit a327fb1

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

mithril-aggregator/src/commands/serve_command.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -227,14 +227,9 @@ impl ServeCommand {
227227
.await
228228
.with_context(|| "Dependencies Builder can not create usage reporter")?;
229229
join_set.spawn(async move {
230-
usage_reporter
231-
.run_forever(Duration::from_secs(
232-
// Export interval are in seconds
233-
//config.export_metrics_interval_seconds,
234-
// TODO It's hardcoded until we implement the configuration
235-
3, // TODO The value is low for testing purposes
236-
))
237-
.await;
230+
let interval_duration =
231+
Duration::from_secs(config.persist_usage_report_interval_in_seconds);
232+
usage_reporter.run_forever(interval_duration).await;
238233
Ok(())
239234
});
240235

mithril-aggregator/src/configuration.rs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,9 @@ pub struct Configuration {
183183

184184
/// Metrics HTTP Server listening port.
185185
pub metrics_server_port: u16,
186+
187+
/// Time interval at which usage metrics are persisted in event database (in seconds).
188+
pub persist_usage_report_interval_in_seconds: u64,
186189
}
187190

188191
/// Uploader needed to copy the snapshot once computed.
@@ -266,6 +269,7 @@ impl Configuration {
266269
enable_metrics_server: true,
267270
metrics_server_ip: "0.0.0.0".to_string(),
268271
metrics_server_port: 9090,
272+
persist_usage_report_interval_in_seconds: 10,
269273
}
270274
}
271275

@@ -395,6 +399,9 @@ pub struct DefaultConfiguration {
395399

396400
/// Metrics HTTP server listening port.
397401
pub metrics_server_port: u16,
402+
403+
/// Time interval at which metrics are persisted in event database (in seconds).
404+
pub persist_usage_report_interval_in_seconds: u64,
398405
}
399406

400407
impl Default for DefaultConfiguration {
@@ -426,6 +433,7 @@ impl Default for DefaultConfiguration {
426433
enable_metrics_server: "false".to_string(),
427434
metrics_server_ip: "0.0.0.0".to_string(),
428435
metrics_server_port: 9090,
436+
persist_usage_report_interval_in_seconds: 10,
429437
}
430438
}
431439
}
@@ -465,7 +473,6 @@ impl Source for DefaultConfiguration {
465473
}
466474
let mut result = Map::new();
467475
let myself = self.clone();
468-
469476
insert_default_configuration!(result, myself.environment);
470477
insert_default_configuration!(result, myself.server_ip);
471478
insert_default_configuration!(result, myself.server_port);
@@ -496,6 +503,7 @@ impl Source for DefaultConfiguration {
496503
insert_default_configuration!(result, myself.enable_metrics_server);
497504
insert_default_configuration!(result, myself.metrics_server_ip);
498505
insert_default_configuration!(result, myself.metrics_server_port);
506+
insert_default_configuration!(result, myself.persist_usage_report_interval_in_seconds);
499507
result.insert(
500508
"cardano_transactions_signing_config".to_string(),
501509
into_value(HashMap::from([
@@ -513,7 +521,6 @@ impl Source for DefaultConfiguration {
513521
),
514522
])),
515523
);
516-
517524
Ok(result)
518525
}
519526
}

mithril-test-lab/mithril-end-to-end/src/mithril/aggregator.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ impl Aggregator {
9999
"1",
100100
),
101101
("CARDANO_TRANSACTIONS_SIGNING_CONFIG__STEP", "15"),
102+
("PERSIST_USAGE_REPORT_INTERVAL_IN_SECONDS", "3"),
102103
]);
103104
let args = vec![
104105
"--db-directory",

0 commit comments

Comments
 (0)