mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

Replace cDebug() with Logs::DebugEnabled().

Browse Source
This commit is contained in:
John Preston
2018-06-05 16:32:26 +03:00
parent 9055b33e92
commit 72f95b984f
22 changed files with 58 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Telegram/SourceFiles/logs.cpp
View File

@@ -243,7 +243,7 @@ QString LogsBeforeSingleInstanceChecked; // LogsInMemory already dumped in LogsD
void _logsWrite(LogDataType type, const QString &msg) {
if (LogsData && (type == LogDataMain || LogsStartIndexChosen < 0)) {
if (type == LogDataMain || cDebug()) {
if (type == LogDataMain || Logs::DebugEnabled()) {
LogsData->write(type, msg);
}
} else if (LogsInMemory != DeletedLogsInMemory) {
@@ -259,6 +259,8 @@ void _logsWrite(LogDataType type, const QString &msg) {
namespace Logs {
namespace {
bool DebugModeEnabled = false;
void MoveOldDataFiles(const QString &wasDir) {
QFile data(wasDir + "data"), dataConfig(wasDir + "data_config"), tdataConfig(wasDir + "tdata/config");
if (data.exists() && dataConfig.exists() && !QFileInfo(cWorkingDir() + "data").exists() && !QFileInfo(cWorkingDir() + "data_config").exists()) { // move to home dir
@@ -307,6 +309,18 @@ void MoveOldDataFiles(const QString &wasDir) {
} // namespace
void SetDebugEnabled(bool enabled) {
DebugModeEnabled = enabled;
}
bool DebugEnabled() {
#if defined _DEBUG
return true;
#else
return DebugModeEnabled;
#endif
}
void start(not_null<Core::Launcher*> launcher) {
Assert(LogsData == 0);
@@ -319,7 +333,7 @@ void start(not_null<Core::Launcher*> launcher) {
auto workingDirChosen = false;
if (cBetaVersion()) {
cSetDebug(true);
SetDebugEnabled(true);
workingDirChosen = true;
#if defined Q_OS_MAC || defined Q_OS_LINUX
} else {
@@ -385,7 +399,7 @@ void start(not_null<Core::Launcher*> launcher) {
LogsData = 0;
}
LOG(("Launched version: %1, alpha: %2, beta: %3, debug mode: %4, test dc: %5").arg(AppVersion).arg(Logs::b(cAlphaVersion())).arg(cBetaVersion()).arg(Logs::b(cDebug())).arg(Logs::b(cTestMode())));
LOG(("Launched version: %1, alpha: %2, beta: %3, debug mode: %4, test dc: %5").arg(AppVersion).arg(Logs::b(cAlphaVersion())).arg(cBetaVersion()).arg(Logs::b(DebugEnabled())).arg(Logs::b(cTestMode())));
LOG(("Executable dir: %1, name: %2").arg(cExeDir()).arg(cExeName()));
LOG(("Initial working dir: %1").arg(initialWorkingDir));
LOG(("Working dir: %1").arg(cWorkingDir()));
@@ -475,7 +489,7 @@ void multipleInstances() {
}
LogsInMemory = DeletedLogsInMemory;
if (cDebug()) {
if (Logs::DebugEnabled()) {
LOG(("WARNING: debug logs are not written in multiple instances mode!"));
}
LogsBeforeSingleInstanceChecked.clear();