diff --git a/WSJTXLogging.cpp b/WSJTXLogging.cpp index d18d938ae..93bcb833b 100644 --- a/WSJTXLogging.cpp +++ b/WSJTXLogging.cpp @@ -192,7 +192,7 @@ WSJTXLogging::WSJTXLogging () ( sinks::file::make_collector ( - keywords::max_size = 40 * 1024 * 1024 + keywords::max_size = 5 * 1024 * 1024 , keywords::min_free_space = 1024 * 1024 * 1024 , keywords::max_files = 12 , keywords::target = app_data.absoluteFilePath ("logs").toStdWString () diff --git a/example_log_configurations/wsjtx_log_config.ini.rig_control b/example_log_configurations/wsjtx_log_config.ini.rig_control index 0bcb82066..bcf981b30 100644 --- a/example_log_configurations/wsjtx_log_config.ini.rig_control +++ b/example_log_configurations/wsjtx_log_config.ini.rig_control @@ -7,7 +7,7 @@ TargetFileName="${AppLocalDataLocation}/logs/wsjtx_syslog_%Y-%m.log" RotationTimePoint="01 00:00:00" Append=true EnableFinalRotation=false -MaxSize=41943040 +MaxSize=52428800 MinFreeSpace=1073741824 MaxFiles=12 Target="${AppLocalDataLocation}/logs" diff --git a/main.cpp b/main.cpp index 0960789e0..2db250b33 100644 --- a/main.cpp +++ b/main.cpp @@ -225,8 +225,7 @@ int main(int argc, char *argv[]) // disallow multiple instances with same instance key QLockFile instance_lock {temp_dir.absoluteFilePath (a.applicationName () + ".lock")}; instance_lock.setStaleLockTime (0); - bool lock_ok {false}; - while (!(lock_ok = instance_lock.tryLock ())) + while (!instance_lock.tryLock ()) { if (QLockFile::LockFailedError == instance_lock.error ()) { @@ -249,6 +248,10 @@ int main(int argc, char *argv[]) throw std::runtime_error {"Multiple instances must have unique rig names"}; } } + else + { + throw std::runtime_error {"Failed to access lock file"}; + } } // load UI translations