cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Revert runtime drop (#1198)

Browse Source
This commit is contained in:
Age Manning 2020-05-27 06:38:12 +10:00 committed by GitHub
parent 5122b2c13a
commit 61496d8dad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lighthouse/environment/src/lib.rs
View File

@ -276,7 +276,7 @@ impl<E: EthSpec> Environment<E> {
/// Shutdown the `tokio` runtime when all tasks are idle. /// Shutdown the `tokio` runtime when all tasks are idle.
pub fn shutdown_on_idle(self) { pub fn shutdown_on_idle(self) {
self.runtime self.runtime
.shutdown_timeout(std::time::Duration::from_secs(5)) .shutdown_timeout(std::time::Duration::from_secs(2))
} }
/// Sets the logger (and all child loggers) to log to a file. /// Sets the logger (and all child loggers) to log to a file.

6
lighthouse/src/main.rs
View File

@ -241,9 +241,5 @@ fn run<E: EthSpec>(
drop(validator_client); drop(validator_client);
// Shutdown the environment once all tasks have completed. // Shutdown the environment once all tasks have completed.
// Due to a bug in tokio: https://github.com/tokio-rs/tokio/issues/2314 Ok(environment.shutdown_on_idle())
// the `shutdown_on_idle()` will wait until the entire timeout. For the time-being, we shutdown as soon as all
// threads have completed, by dropping the runtime.
//Ok(environment.shutdown_on_idle())
Ok(())
} }