From e501a3f4a3e3c2d30e5eb8f59bce84f25b912c0e Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Thu, 1 Sep 2022 07:32:48 +0200 Subject: [PATCH] remove FileLog::synchro_lock() and FileLog::synchro_unlock() --- src/log/filelog.cpp | 56 ++++++++++++++------------------------------- src/log/filelog.h | 5 +--- 2 files changed, 18 insertions(+), 43 deletions(-) diff --git a/src/log/filelog.cpp b/src/log/filelog.cpp index 29d22cc..e854894 100644 --- a/src/log/filelog.cpp +++ b/src/log/filelog.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2018-2021, Tomasz Sowa + * Copyright (c) 2018-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -58,17 +58,6 @@ FileLog::~FileLog() } -bool FileLog::synchro_lock() -{ - return true; -} - - -void FileLog::synchro_unlock() -{ -} - - void FileLog::init(const std::wstring & log_file, bool log_stdout, int log_level, bool save_each_line) { this->log_stdout = log_stdout; @@ -105,39 +94,28 @@ void FileLog::save_log(WTextStream * buffer) if( buffer->empty() ) return; - if( synchro_lock() ) + if( log_stdout ) { - try + wide_stream_to_utf8(*buffer, std::cout); + std::cout.flush(); + } + + if( !log_file.empty() ) + { + if( !log_file_open || !file ) { - if( log_stdout ) - { - wide_stream_to_utf8(*buffer, std::cout); - std::cout.flush(); - } - - if( !log_file.empty() ) - { - if( !log_file_open || !file ) - { - file.close(); - file.clear(); - - open_file(); - } - - if( file ) - { - wide_stream_to_utf8(*buffer, file); - file.flush(); - } - } + file.close(); + file.clear(); + + open_file(); } - catch(...) + + if( file ) { + wide_stream_to_utf8(*buffer, file); + file.flush(); } } - - synchro_unlock(); } diff --git a/src/log/filelog.h b/src/log/filelog.h index 0c315c2..1581d14 100644 --- a/src/log/filelog.h +++ b/src/log/filelog.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2018, Tomasz Sowa + * Copyright (c) 2018-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -79,9 +79,6 @@ protected: // whether to save each line (for debug) bool save_each_line; - - virtual bool synchro_lock(); - virtual void synchro_unlock(); virtual void open_file(); };