Skip to content

Commit 21923ef

Browse files
Add log messages to onvif_rs::discovery
1 parent bf1c3a7 commit 21923ef

File tree

7 files changed

+27
-5
lines changed

7 files changed

+27
-5
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/target
22
**/*.rs.bk
33
Cargo.lock
4-
.idea
4+
.idea
5+
.env

Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ xsd-types = { git = "https://github.com/lumeohq/xsd-parser-rs", rev = "05cd3be1"
2929

3030
[dev-dependencies]
3131
assert_approx_eq = "1.1.0"
32+
dotenv = "0.15.0"
33+
env_logger = "0.7.1"

examples/camera_datetime.rs

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ use onvif_rs::{schema, soap};
33

44
#[tokio::main]
55
async fn main() {
6+
dotenv::dotenv().ok();
7+
env_logger::init();
8+
69
let uri = match std::env::args().skip(1).next() {
710
Some(arg) => arg,
811
None => {

examples/camera_get_stream_uri.rs

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ use onvif_rs::{schema, soap};
33

44
#[tokio::main]
55
async fn main() {
6+
dotenv::dotenv().ok();
7+
env_logger::init();
8+
69
let uri = match std::env::args().skip(1).next() {
710
Some(arg) => arg,
811
None => {

examples/camera_set_hostname.rs

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ struct Opts {
1010

1111
#[tokio::main]
1212
async fn main() {
13+
dotenv::dotenv().ok();
14+
env_logger::init();
15+
1316
let opts = Opts::parse();
1417

1518
let mut client = soap::client::Client::new(

examples/discovery.rs

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ use onvif_rs::discovery;
33

44
#[tokio::main]
55
async fn main() {
6+
dotenv::dotenv().ok();
7+
env_logger::init();
8+
69
use futures::stream::StreamExt;
710
const MAX_CONCURRENT_JUMPERS: usize = 100;
811

src/discovery/mod.rs

+11-4
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ pub async fn discover(duration: std::time::Duration) -> Result<StringStream, Err
6969
let probe = build_probe();
7070
let probe_xml = yaserde::ser::to_string(&probe).map_err(Error::Internal)?;
7171

72+
debug!("Probe XML: {}", probe_xml);
73+
7274
let socket = (|| async {
7375
const LOCAL_IPV4_ADDR: Ipv4Addr = Ipv4Addr::UNSPECIFIED;
7476
const LOCAL_PORT: u16 = 0;
@@ -96,9 +98,10 @@ pub async fn discover(duration: std::time::Duration) -> Result<StringStream, Err
9698
// Make an async stream of XML's
9799
futures::stream::unfold(socket, |s| async { Some((recv_string(&s).await, s)) })
98100
.filter_map(|string| async move { string.ok() })
99-
.filter_map(
100-
|xml| async move { yaserde::de::from_str::<probe_matches::Envelope>(&xml).ok() },
101-
)
101+
.filter_map(|xml| async move {
102+
debug!("Probe match XML: {}", xml);
103+
yaserde::de::from_str::<probe_matches::Envelope>(&xml).ok()
104+
})
102105
.filter(move |envelope| {
103106
futures::future::ready(envelope.header.relates_to == probe.header.message_id)
104107
})
@@ -151,7 +154,11 @@ where
151154
.filter(|addr| check_addr(addr.clone()))
152155
.take(1);
153156

154-
Box::pin(stream).next().await
157+
let addr = Box::pin(stream).next().await;
158+
159+
debug!("Responding addr: {:?}", addr);
160+
161+
addr
155162
}
156163

157164
fn build_probe() -> probe::Envelope {

0 commit comments

Comments
 (0)