diff options
author | Alex Auvolat <alex@adnab.me> | 2020-04-18 19:39:08 +0200 |
---|---|---|
committer | Alex Auvolat <alex@adnab.me> | 2020-04-18 19:39:57 +0200 |
commit | 4ba54ccfca2ff8e56c58d0a652de256428282490 (patch) | |
tree | d98bc1bcb565bff4d018b252f5f1397253f9f697 /src/server.rs | |
parent | bd1618e78e4c4305a73bdd40004de2abe46c3ceb (diff) | |
download | garage-4ba54ccfca2ff8e56c58d0a652de256428282490.tar.gz garage-4ba54ccfca2ff8e56c58d0a652de256428282490.zip |
Reorder imports.
Trying to separate:
1. Stuff for handling the swarm of nodes and generic table data replication
2. Stuff for the object store core application: metadata tables and block management
3. Stuff for the S3 API
Diffstat (limited to 'src/server.rs')
-rw-r--r-- | src/server.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/server.rs b/src/server.rs index 099e087e..e728c667 100644 --- a/src/server.rs +++ b/src/server.rs @@ -8,18 +8,20 @@ pub use futures_util::future::FutureExt; use serde::Deserialize; use tokio::sync::watch; -use crate::api_server; use crate::background::*; -use crate::block::*; -use crate::block_ref_table::*; use crate::data::*; use crate::error::Error; use crate::membership::System; -use crate::object_table::*; use crate::rpc_server::RpcServer; use crate::table::*; + +use crate::block::*; +use crate::block_ref_table::*; +use crate::object_table::*; use crate::version_table::*; +use crate::api_server; + pub const DEFAULT_TIMEOUT: Duration = Duration::from_secs(10); #[derive(Deserialize, Debug, Clone)] |