grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't display an overlay in case the time sync check fails. (#6164)

Browse Source 
* Small improvements to time estimation.

* Temporarily disable NTP time check by default.
This commit is contained in:
Tomasz Drwięga
2017-07-27 17:36:23 +02:00
committed by Arkadiy Paronyan
parent 0209c6e0ff
commit 9902714fb4
8 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dapps/src/api/time.rs
View File

@@ -100,6 +100,10 @@ impl SimpleNtp {
impl Ntp for SimpleNtp {
fn drift(&self) -> BoxFuture<Duration, Error> {
let address = self.address.clone();
if &*address == "none" {
return futures::future::err(Error::Ntp("NTP server is not provided.".into())).boxed();
}
self.pool.spawn_fn(move || {
let packet = ntp::request(&*address)?;
let dest_time = ::time::now_utc().to_timespec();
@@ -114,7 +118,9 @@ impl Ntp for SimpleNtp {
}
}
const MAX_RESULTS: usize = 4;
// NOTE In a positive scenario first results will be seen after:
// MAX_RESULTS * UPDATE_TIMEOUT_OK_SECS seconds.
const MAX_RESULTS: usize = 7;
const UPDATE_TIMEOUT_OK_SECS: u64 = 30;
const UPDATE_TIMEOUT_ERR_SECS: u64 = 2;
@@ -225,7 +231,7 @@ mod tests {
fn time_checker() -> TimeChecker<FakeNtp> {
let last_result = Arc::new(RwLock::new(
(Instant::now(), vec![Err(Error::Ntp("NTP server unavailable.".into()))].into())
(Instant::now(), vec![Err(Error::Ntp("NTP server unavailable".into()))].into())
));
TimeChecker {