hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

format log, add space after colon

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2023-11-18 09:47:08 +08:00
parent 0b5f48b926
commit f9ee0189f0
15 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/hbb_common/src/fs.rs
View File

@ -540,7 +540,7 @@ impl TransferJob {
msg.set_file_response(resp); msg.set_file_response(resp);
stream.send(&msg).await?; stream.send(&msg).await?;
log::info!( log::info!(
"id: {}, file_num:{}, digest message is sent. waiting for confirm. msg: {:?}", "id: {}, file_num: {}, digest message is sent. waiting for confirm. msg: {:?}",
self.id, self.id,
self.file_num, self.file_num,
msg msg
@ -723,7 +723,7 @@ pub fn new_receive(
#[inline] #[inline]
pub fn new_send(id: i32, path: String, file_num: i32, include_hidden: bool) -> Message { pub fn new_send(id: i32, path: String, file_num: i32, include_hidden: bool) -> Message {
log::info!("new send: {},id : {}", path, id); log::info!("new send: {}, id: {}", path, id);
let mut action = FileAction::new(); let mut action = FileAction::new();
action.set_send(FileTransferSendRequest { action.set_send(FileTransferSendRequest {
id, id,

6
libs/scrap/src/common/codec.rs
View File

@ -108,7 +108,7 @@ pub enum EncodingUpdate {
impl Encoder { impl Encoder {
pub fn new(config: EncoderCfg, i444: bool) -> ResultType<Encoder> { pub fn new(config: EncoderCfg, i444: bool) -> ResultType<Encoder> {
log::info!("new encoder:{config:?}, i444:{i444}"); log::info!("new encoder: {config:?}, i444: {i444}");
match config { match config {
EncoderCfg::VPX(_) => Ok(Encoder { EncoderCfg::VPX(_) => Ok(Encoder {
codec: Box::new(VpxEncoder::new(config, i444)?), codec: Box::new(VpxEncoder::new(config, i444)?),
@ -215,7 +215,7 @@ impl Encoder {
} }
log::info!( log::info!(
"connection count:{}, used preference:{:?}, encoder:{:?}", "connection count: {}, used preference: {:?}, encoder: {:?}",
decodings.len(), decodings.len(),
preference, preference,
*name *name
@ -600,7 +600,7 @@ pub fn codec_thread_num() -> usize {
None => true, None => true,
}; };
if log { if log {
log::info!("cpu num:{max}, {info}, codec thread:{res}"); log::info!("cpu num: {max}, {info}, codec thread: {res}");
*THREAD_LOG_TIME.lock().unwrap() = Some(Instant::now()); *THREAD_LOG_TIME.lock().unwrap() = Some(Instant::now());
} }
res res

4
libs/scrap/src/common/mediacodec.rs
View File

@ -144,12 +144,12 @@ fn create_media_codec(name: &str, direction: MediaCodecDirection) -> Option<Medi
media_format.set_i32("height", 0); media_format.set_i32("height", 0);
media_format.set_i32("color-format", 19); // COLOR_FormatYUV420Planar media_format.set_i32("color-format", 19); // COLOR_FormatYUV420Planar
if let Err(e) = codec.configure(&media_format, None, direction) { if let Err(e) = codec.configure(&media_format, None, direction) {
log::error!("Failed to init decoder:{:?}", e); log::error!("Failed to init decoder: {:?}", e);
return None; return None;
}; };
log::error!("decoder init success"); log::error!("decoder init success");
if let Err(e) = codec.start() { if let Err(e) = codec.start() {
log::error!("Failed to start decoder:{:?}", e); log::error!("Failed to start decoder: {:?}", e);
return None; return None;
}; };
log::debug!("Init decoder successed!: {:?}", name); log::debug!("Init decoder successed!: {:?}", name);

2
libs/scrap/src/common/mod.rs
View File

@ -382,7 +382,7 @@ pub trait GoogleImage {
); );
} }
// (Chroma::I444, ImageFormat::Raw), new version libyuv have I444ToRAW // (Chroma::I444, ImageFormat::Raw), new version libyuv have I444ToRAW
_ => log::error!("unsupported pixfmt:{:?}", self.chroma()), _ => log::error!("unsupported pixfmt: {:?}", self.chroma()),
} }
} }
} }

4
libs/scrap/src/common/record.rs
View File

@ -60,7 +60,7 @@ impl RecorderContext {
".mp4" ".mp4"
}; };
self.filename = PathBuf::from(&dir).join(file).to_string_lossy().to_string(); self.filename = PathBuf::from(&dir).join(file).to_string_lossy().to_string();
log::info!("video will save to:{}", self.filename); log::info!("video will save to {}", self.filename);
Ok(()) Ok(())
} }
} }
@ -225,7 +225,7 @@ impl Recorder {
let old_pts = self.pts; let old_pts = self.pts;
self.pts = Some(pts); self.pts = Some(pts);
if old_pts.clone().unwrap_or_default() > pts { if old_pts.clone().unwrap_or_default() > pts {
log::info!("pts {:?}->{}, change record filename", old_pts, pts); log::info!("pts {:?} -> {}, change record filename", old_pts, pts);
self.change(self.ctx.clone())?; self.change(self.ctx.clone())?;
} }
Ok(()) Ok(())

2
src/client.rs
View File

@ -2085,7 +2085,7 @@ where
} }
} }
MediaData::RecordScreen(start, display, w, h, id) => { MediaData::RecordScreen(start, display, w, h, id) => {
log::info!("record screen command: start:{start}, display:{display}"); log::info!("record screen command: start: {start}, display: {display}");
if handler_controller_map.len() == 1 { if handler_controller_map.len() == 1 {
// Compatible with the sciter version(single ui session). // Compatible with the sciter version(single ui session).
// For the sciter version, there're no multi-ui-sessions for one connection. // For the sciter version, there're no multi-ui-sessions for one connection.

2
src/core_main.rs
View File

@ -148,7 +148,7 @@ pub fn core_main() -> Option<Vec<String>> {
{ {
use crate::portable_service::client; use crate::portable_service::client;
if let Err(e) = client::start_portable_service(client::StartPara::Direct) { if let Err(e) = client::start_portable_service(client::StartPara::Direct) {
log::error!("Failed to start portable service:{:?}", e); log::error!("Failed to start portable service: {:?}", e);
} }
} }
#[cfg(windows)] #[cfg(windows)]

2
src/flutter_ffi.rs
View File

@ -1761,7 +1761,7 @@ pub fn main_test_wallpaper(_second: u64) {
std::thread::sleep(std::time::Duration::from_secs(_second)); std::thread::sleep(std::time::Duration::from_secs(_second));
} }
Err(e) => { Err(e) => {
log::info!("create wallpaper remover failed:{:?}", e); log::info!("create wallpaper remover failed: {:?}", e);
} }
}); });
} }

6
src/hbbs_http/record_upload.rs
View File

@ -63,12 +63,12 @@ pub fn run(rx: Receiver<RecordState>) {
} }
}, },
Err(e) => { Err(e) => {
log::trace!("upload thread stop:{}", e); log::trace!("upload thread stop: {}", e);
break; break;
} }
} { } {
uploader.running = false; uploader.running = false;
log::error!("upload stop:{}", e); log::error!("upload stop: {}", e);
} }
}); });
} }
@ -184,7 +184,7 @@ impl RecordUploader {
], ],
buf, buf,
)?; )?;
log::info!("upload success, file:{}", self.filename); log::info!("upload success, file: {}", self.filename);
Ok(()) Ok(())
} }
Err(e) => bail!(e.to_string()), Err(e) => bail!(e.to_string()),

2
src/keyboard.rs
View File

@ -315,7 +315,7 @@ pub fn start_grab_loop() {
if let Err(err) = rdev::start_grab_listen(move |event: Event| match event.event_type { if let Err(err) = rdev::start_grab_listen(move |event: Event| match event.event_type {
EventType::KeyPress(key) | EventType::KeyRelease(key) => { EventType::KeyPress(key) | EventType::KeyRelease(key) => {
if let Key::Unknown(keycode) = key { if let Key::Unknown(keycode) = key {
log::error!("rdev get unknown key, keycode is : {:?}", keycode); log::error!("rdev get unknown key, keycode is {:?}", keycode);
} else { } else {
client::process_event(&get_keyboard_mode(), &event, None); client::process_event(&get_keyboard_mode(), &event, None);
} }

2
src/platform/linux.rs
View File

@ -1335,7 +1335,7 @@ impl WallPaperRemover {
wallpaper::set_from_path("").map_err(|e| anyhow!(e.to_string()))?; wallpaper::set_from_path("").map_err(|e| anyhow!(e.to_string()))?;
wallpaper::set_dark_from_path("").ok(); wallpaper::set_dark_from_path("").ok();
log::info!( log::info!(
"created wallpaper remover, old_path:{:?}, old_path_dark:{:?}, elapsed:{:?}", "created wallpaper remover, old_path: {:?}, old_path_dark: {:?}, elapsed: {:?}",
old_path, old_path,
old_path_dark, old_path_dark,
start.elapsed(), start.elapsed(),

14
src/platform/windows.rs
View File

@ -1504,7 +1504,7 @@ pub fn run_as_system(arg: &str) -> ResultType<()> {
pub fn elevate_or_run_as_system(is_setup: bool, is_elevate: bool, is_run_as_system: bool) { pub fn elevate_or_run_as_system(is_setup: bool, is_elevate: bool, is_run_as_system: bool) {
// avoid possible run recursively due to failed run. // avoid possible run recursively due to failed run.
log::info!( log::info!(
"elevate:{}->{:?}, run_as_system:{}->{}", "elevate: {} -> {:?}, run_as_system: {} -> {}",
is_elevate, is_elevate,
is_elevated(None), is_elevated(None),
is_run_as_system, is_run_as_system,
@ -1534,7 +1534,7 @@ pub fn elevate_or_run_as_system(is_setup: bool, is_elevate: bool, is_run_as_syst
std::process::exit(0); std::process::exit(0);
} else { } else {
unsafe { unsafe {
log::error!("Failed to run as system, errno={}", GetLastError()); log::error!("Failed to run as system, errno = {}", GetLastError());
} }
} }
} }
@ -1544,14 +1544,14 @@ pub fn elevate_or_run_as_system(is_setup: bool, is_elevate: bool, is_run_as_syst
std::process::exit(0); std::process::exit(0);
} else { } else {
unsafe { unsafe {
log::error!("Failed to elevate, errno={}", GetLastError()); log::error!("Failed to elevate, errno = {}", GetLastError());
} }
} }
} }
} }
} }
Err(_) => unsafe { Err(_) => unsafe {
log::error!("Failed to get elevation status, errno={}", GetLastError()); log::error!("Failed to get elevation status, errno = {}", GetLastError());
}, },
} }
} }
@ -2409,13 +2409,13 @@ impl WallPaperRemover {
let old_path = match Self::get_recent_wallpaper() { let old_path = match Self::get_recent_wallpaper() {
Ok(old_path) => old_path, Ok(old_path) => old_path,
Err(e) => { Err(e) => {
log::info!("Failed to get recent wallpaper:{:?}, use fallback", e); log::info!("Failed to get recent wallpaper: {:?}, use fallback", e);
wallpaper::get().map_err(|e| anyhow!(e.to_string()))? wallpaper::get().map_err(|e| anyhow!(e.to_string()))?
} }
}; };
Self::set_wallpaper(None)?; Self::set_wallpaper(None)?;
log::info!( log::info!(
"created wallpaper remover, old_path:{:?}, elapsed:{:?}", "created wallpaper remover, old_path: {:?}, elapsed: {:?}",
old_path, old_path,
start.elapsed(), start.elapsed(),
); );
@ -2433,7 +2433,7 @@ impl WallPaperRemover {
let (hkcu, sid) = if is_root() { let (hkcu, sid) = if is_root() {
let username = get_active_username(); let username = get_active_username();
let sid = get_sid_of_user(&username)?; let sid = get_sid_of_user(&username)?;
log::info!("username:{username}, sid:{sid}"); log::info!("username: {username}, sid: {sid}");
(RegKey::predef(HKEY_USERS), format!("{}\\", sid)) (RegKey::predef(HKEY_USERS), format!("{}\\", sid))
} else { } else {
(RegKey::predef(HKEY_CURRENT_USER), "".to_string()) (RegKey::predef(HKEY_CURRENT_USER), "".to_string())

8
src/server/connection.rs
View File

@ -534,7 +534,7 @@ impl Connection {
#[cfg(windows)] #[cfg(windows)]
ipc::Data::DataPortableService(ipc::DataPortableService::RequestStart) => { ipc::Data::DataPortableService(ipc::DataPortableService::RequestStart) => {
if let Err(e) = portable_client::start_portable_service(portable_client::StartPara::Direct) { if let Err(e) = portable_client::start_portable_service(portable_client::StartPara::Direct) {
log::error!("Failed to start portable service from cm:{:?}", e); log::error!("Failed to start portable service from cm: {:?}", e);
} }
} }
ipc::Data::SwitchSidesBack => { ipc::Data::SwitchSidesBack => {
@ -1267,7 +1267,7 @@ impl Connection {
}); });
} }
Err(e) => { Err(e) => {
log::info!("create wallpaper remover failed:{:?}", e); log::info!("create wallpaper remover failed: {:?}", e);
} }
} }
} }
@ -2143,7 +2143,7 @@ impl Connection {
if self.restart { if self.restart {
match system_shutdown::reboot() { match system_shutdown::reboot() {
Ok(_) => log::info!("Restart by the peer"), Ok(_) => log::info!("Restart by the peer"),
Err(e) => log::error!("Failed to restart:{}", e), Err(e) => log::error!("Failed to restart: {}", e),
} }
} }
} }
@ -2410,7 +2410,7 @@ impl Connection {
crate::platform::change_resolution(&name, r.width as _, r.height as _) crate::platform::change_resolution(&name, r.width as _, r.height as _)
{ {
log::error!( log::error!(
"Failed to change resolution '{}' to ({},{}):{:?}", "Failed to change resolution '{}' to ({},{}): {:?}",
&name, &name,
r.width, r.width,
r.height, r.height,

12
src/server/portable_service.rs
View File

@ -89,7 +89,7 @@ impl SharedMemory {
bail!("Unable to create shmem flink {} : {}", flink, e); bail!("Unable to create shmem flink {} : {}", flink, e);
} }
}; };
log::info!("Create shared memory, size:{}, flink:{}", size, flink); log::info!("Create shared memory, size: {}, flink: {}", size, flink);
set_path_permission(&PathBuf::from(flink), "F").ok(); set_path_permission(&PathBuf::from(flink), "F").ok();
Ok(SharedMemory { inner: shmem }) Ok(SharedMemory { inner: shmem })
} }
@ -102,7 +102,7 @@ impl SharedMemory {
bail!("Unable to open existing shmem flink {} : {}", flink, e); bail!("Unable to open existing shmem flink {} : {}", flink, e);
} }
}; };
log::info!("open existing shared memory, flink:{:?}", flink); log::info!("open existing shared memory, flink: {:?}", flink);
Ok(SharedMemory { inner: shmem }) Ok(SharedMemory { inner: shmem })
} }
@ -351,7 +351,7 @@ pub mod server {
} }
} }
Err(e) => { Err(e) => {
log::error!("Failed to create gdi capturer:{:?}", e); log::error!("Failed to create gdi capturer: {:?}", e);
std::thread::sleep(std::time::Duration::from_secs(1)); std::thread::sleep(std::time::Duration::from_secs(1));
continue; continue;
} }
@ -359,7 +359,7 @@ pub mod server {
} else { } else {
if recreate || current_display != last_current_display { if recreate || current_display != last_current_display {
log::info!( log::info!(
"create capturer, display:{}->{}", "create capturer, display: {} -> {}",
last_current_display, last_current_display,
current_display, current_display,
); );
@ -399,7 +399,7 @@ pub mod server {
Some(Err(e)) => { Some(Err(e)) => {
if e.kind() != std::io::ErrorKind::WouldBlock { if e.kind() != std::io::ErrorKind::WouldBlock {
// DXGI_ERROR_INVALID_CALL after each success on Microsoft GPU driver // DXGI_ERROR_INVALID_CALL after each success on Microsoft GPU driver
// log::error!("capture frame failed:{:?}", e); // log::error!("capture frame failed: {:?}", e);
if crate::platform::windows::desktop_changed() { if crate::platform::windows::desktop_changed() {
crate::platform::try_change_desktop(); crate::platform::try_change_desktop();
c = None; c = None;
@ -500,7 +500,7 @@ pub mod server {
} }
} }
Err(e) => { Err(e) => {
log::error!("Failed to connect portable service ipc:{:?}", e); log::error!("Failed to connect portable service ipc: {:?}", e);
} }
} }

2
src/server/video_service.rs
View File

@ -402,7 +402,7 @@ fn run(vs: VideoService) -> ResultType<()> {
let mut spf; let mut spf;
let mut quality = video_qos.quality(); let mut quality = video_qos.quality();
let abr = VideoQoS::abr_enabled(); let abr = VideoQoS::abr_enabled();
log::info!("init quality={:?}, abr enabled:{}", quality, abr); log::info!("initial quality: {quality:?}, abr enabled: {abr}");
let codec_name = Encoder::negotiated_codec(); let codec_name = Encoder::negotiated_codec();
let recorder = get_recorder(c.width, c.height, &codec_name); let recorder = get_recorder(c.width, c.height, &codec_name);
let last_recording = recorder.lock().unwrap().is_some() || video_qos.record(); let last_recording = recorder.lock().unwrap().is_some() || video_qos.record();