From 9b05337e579852711a7e221ac0c5076cae3dbec1 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 13 Jul 2020 15:03:04 -0400 Subject: [PATCH] Priming capture logs should be debug level, especially if they ar egoing to log passwords --- src/zm_ffmpeg_camera.cpp | 4 ++-- src/zm_libvlc_camera.cpp | 3 +-- src/zm_libvnc_camera.cpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp index b663682a3..2ca712db8 100644 --- a/src/zm_ffmpeg_camera.cpp +++ b/src/zm_ffmpeg_camera.cpp @@ -208,12 +208,12 @@ void FfmpegCamera::Terminate() { int FfmpegCamera::PrimeCapture() { if ( mCanCapture ) { - Info("Priming capture from %s, Closing", mPath.c_str()); + Debug(1, "Priming capture from %s, Closing", mPath.c_str()); Close(); } mVideoStreamId = -1; mAudioStreamId = -1; - Info("Priming capture from %s", mPath.c_str()); + Debug(1, "Priming capture from %s", mPath.c_str()); return OpenFfmpeg(); } diff --git a/src/zm_libvlc_camera.cpp b/src/zm_libvlc_camera.cpp index 1bb3bd8cb..03fd00570 100644 --- a/src/zm_libvlc_camera.cpp +++ b/src/zm_libvlc_camera.cpp @@ -198,8 +198,7 @@ void LibvlcCamera::Terminate() { } int LibvlcCamera::PrimeCapture() { - Info("Priming capture from %s", mPath.c_str()); - Info("Libvlc Version %s", (*libvlc_get_version_f)()); + Debug(1, "Priming capture from %s, libvlc version %s", mPath.c_str(), (*libvlc_get_version_f)()); StringVector opVect = split(Options(), ","); diff --git a/src/zm_libvnc_camera.cpp b/src/zm_libvnc_camera.cpp index 1f7053112..c88a1c3b2 100644 --- a/src/zm_libvnc_camera.cpp +++ b/src/zm_libvnc_camera.cpp @@ -148,7 +148,7 @@ void VncCamera::Terminate() { } int VncCamera::PrimeCapture() { - Info("Priming capture from %s", mHost.c_str()); + Debug(1, "Priming capture from %s", mHost.c_str()); return 0; }