MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-11-27 20:58:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

update deps (particularly hyper) + fix warnings

Browse Source
This commit is contained in:
Scott Lamb
2017-09-21 21:51:58 -07:00
parent 857a66f29c
commit 11420df065
9 changed files with 439 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/cmds/run.rs
View File

@@ -32,7 +32,7 @@ use clock;
use db;
use dir;
use error::Error;
use futures::{BoxFuture, Future, Stream};
use futures::{Future, Stream};
use std::sync::Arc;
use std::sync::atomic::{AtomicBool, Ordering};
use std::thread;
@@ -66,13 +66,12 @@ struct Args {
flag_read_only: bool,
}
fn setup_shutdown_future(h: &reactor::Handle) -> BoxFuture<(), ()> {
fn setup_shutdown_future(h: &reactor::Handle) -> Box<Future<Item = (), Error = ()>> {
let int = Signal::new(SIGINT, h).flatten_stream().into_future();
let term = Signal::new(SIGTERM, h).flatten_stream().into_future();
int.select(term)
.map(|_| ())
.map_err(|_| ())
.boxed()
Box::new(int.select(term)
.map(|_| ())
.map_err(|_| ()))
}
pub fn run() -> Result<(), Error> {