Moved StopGaurd to it's own crate (#7635)
This commit is contained in:
parent
d430e7f4e2
commit
6bebb9e74a
5
Cargo.lock
generated
5
Cargo.lock
generated
@ -486,6 +486,7 @@ dependencies = [
|
|||||||
"semantic_version 0.1.0",
|
"semantic_version 0.1.0",
|
||||||
"snappy 0.1.0 (git+https://github.com/paritytech/rust-snappy)",
|
"snappy 0.1.0 (git+https://github.com/paritytech/rust-snappy)",
|
||||||
"stats 0.1.0",
|
"stats 0.1.0",
|
||||||
|
"stop-guard 0.1.0",
|
||||||
"table 0.1.0",
|
"table 0.1.0",
|
||||||
"time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
|
"time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"triehash 0.1.0",
|
"triehash 0.1.0",
|
||||||
@ -2975,6 +2976,10 @@ dependencies = [
|
|||||||
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "stop-guard"
|
||||||
|
version = "0.1.0"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "strsim"
|
name = "strsim"
|
||||||
version = "0.6.0"
|
version = "0.6.0"
|
||||||
|
@ -21,9 +21,7 @@ extern crate rand;
|
|||||||
|
|
||||||
mod random_path;
|
mod random_path;
|
||||||
mod test_socket;
|
mod test_socket;
|
||||||
mod stop_guard;
|
|
||||||
pub mod http_client;
|
pub mod http_client;
|
||||||
|
|
||||||
pub use random_path::*;
|
pub use random_path::*;
|
||||||
pub use test_socket::*;
|
pub use test_socket::*;
|
||||||
pub use stop_guard::*;
|
|
||||||
|
@ -53,6 +53,7 @@ kvdb-rocksdb = { path = "../util/kvdb-rocksdb" }
|
|||||||
kvdb-memorydb = { path = "../util/kvdb-memorydb" }
|
kvdb-memorydb = { path = "../util/kvdb-memorydb" }
|
||||||
util-error = { path = "../util/error" }
|
util-error = { path = "../util/error" }
|
||||||
snappy = { git = "https://github.com/paritytech/rust-snappy" }
|
snappy = { git = "https://github.com/paritytech/rust-snappy" }
|
||||||
|
stop-guard = { path = "../util/stop-guard" }
|
||||||
migration = { path = "../util/migration" }
|
migration = { path = "../util/migration" }
|
||||||
macros = { path = "../util/macros" }
|
macros = { path = "../util/macros" }
|
||||||
rust-crypto = "0.2.34"
|
rust-crypto = "0.2.34"
|
||||||
|
@ -105,6 +105,7 @@ extern crate migration;
|
|||||||
extern crate rlp_derive;
|
extern crate rlp_derive;
|
||||||
extern crate rustc_hex;
|
extern crate rustc_hex;
|
||||||
extern crate stats;
|
extern crate stats;
|
||||||
|
extern crate stop_guard;
|
||||||
extern crate time;
|
extern crate time;
|
||||||
extern crate using_queue;
|
extern crate using_queue;
|
||||||
extern crate table;
|
extern crate table;
|
||||||
|
@ -31,6 +31,7 @@ use miner::Miner;
|
|||||||
use snapshot::{ManifestData, RestorationStatus};
|
use snapshot::{ManifestData, RestorationStatus};
|
||||||
use snapshot::service::{Service as SnapshotService, ServiceParams as SnapServiceParams};
|
use snapshot::service::{Service as SnapshotService, ServiceParams as SnapServiceParams};
|
||||||
use ansi_term::Colour;
|
use ansi_term::Colour;
|
||||||
|
use stop_guard::StopGuard;
|
||||||
|
|
||||||
/// Message type for external and internal events
|
/// Message type for external and internal events
|
||||||
#[derive(Clone, PartialEq, Eq, Debug)]
|
#[derive(Clone, PartialEq, Eq, Debug)]
|
||||||
@ -59,7 +60,7 @@ pub struct ClientService {
|
|||||||
client: Arc<Client>,
|
client: Arc<Client>,
|
||||||
snapshot: Arc<SnapshotService>,
|
snapshot: Arc<SnapshotService>,
|
||||||
database: Arc<Database>,
|
database: Arc<Database>,
|
||||||
_stop_guard: ::devtools::StopGuard,
|
_stop_guard: StopGuard,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ClientService {
|
impl ClientService {
|
||||||
@ -111,7 +112,7 @@ impl ClientService {
|
|||||||
|
|
||||||
spec.engine.register_client(Arc::downgrade(&client) as _);
|
spec.engine.register_client(Arc::downgrade(&client) as _);
|
||||||
|
|
||||||
let stop_guard = ::devtools::StopGuard::new();
|
let stop_guard = StopGuard::new();
|
||||||
|
|
||||||
Ok(ClientService {
|
Ok(ClientService {
|
||||||
io_service: Arc::new(io_service),
|
io_service: Arc::new(io_service),
|
||||||
|
6
util/stop-guard/Cargo.toml
Normal file
6
util/stop-guard/Cargo.toml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
[package]
|
||||||
|
name = "stop-guard"
|
||||||
|
version = "0.1.0"
|
||||||
|
authors = ["Parity Technologies <admin@parity.io>"]
|
||||||
|
|
||||||
|
[dependencies]
|
Loading…
Reference in New Issue
Block a user