mirror of
https://github.com/scottlamb/moonfire-nvr.git
synced 2025-11-28 21:18:11 -05:00
upgrade to Retina v0.3.9
This alone improves interop and diagnostics, as noted in Retina's release notes. We also now give the camera name to the session group (for improved logging of TEARDOWN operations) and expose the RTSP server's "tool" attribute in debug logs and the config UI's "Test" button. Fixes #209 Fixes #213
This commit is contained in:
@@ -214,7 +214,7 @@ fn press_test_inner(
|
||||
.enable_io()
|
||||
.build()?;
|
||||
let _guard = rt.enter();
|
||||
let (extra_data, _stream) = stream::OPENER.open(
|
||||
let (extra_data, stream) = stream::OPENER.open(
|
||||
&rt,
|
||||
"test stream".to_owned(),
|
||||
url,
|
||||
@@ -227,8 +227,10 @@ fn press_test_inner(
|
||||
.transport(transport),
|
||||
)?;
|
||||
Ok(format!(
|
||||
"{}x{} video stream",
|
||||
extra_data.width, extra_data.height
|
||||
"{}x{} video stream served by tool {:?}",
|
||||
extra_data.width,
|
||||
extra_data.height,
|
||||
stream.tool(),
|
||||
))
|
||||
}
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ use fnv::FnvHashMap;
|
||||
use hyper::service::{make_service_fn, service_fn};
|
||||
use log::error;
|
||||
use log::{info, warn};
|
||||
use retina::client::SessionGroup;
|
||||
use std::net::SocketAddr;
|
||||
use std::path::Path;
|
||||
use std::path::PathBuf;
|
||||
@@ -324,7 +325,9 @@ async fn inner(
|
||||
let syncer = syncers.get(&sample_file_dir_id).unwrap();
|
||||
let session_group = session_groups_by_camera
|
||||
.entry(camera.id)
|
||||
.or_default()
|
||||
.or_insert_with(|| {
|
||||
Arc::new(SessionGroup::default().named(camera.short_name.clone()))
|
||||
})
|
||||
.clone();
|
||||
let mut streamer = streamer::Streamer::new(
|
||||
&env,
|
||||
|
||||
Reference in New Issue
Block a user