rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added timestamp in log #4845

This commit is contained in:
Jerry (Xinyu Hou) 2015-07-06 15:50:21 -07:00
parent 23739f8484
commit 260a7337d3
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/src/MainWindow.cpp
View File

@ -370,18 +370,18 @@ void MainWindow::updateFound(const QString &version)
void MainWindow::appendLogInfo(const QString& text) void MainWindow::appendLogInfo(const QString& text)
{ {
appendLogRaw("INFO: " + text); appendLogRaw(getTimeStamp() + " INFO: " + text);
} }
void MainWindow::appendLogDebug(const QString& text) { void MainWindow::appendLogDebug(const QString& text) {
if (appConfig().logLevel() >= 1) { if (appConfig().logLevel() >= 1) {
appendLogRaw("DEBUG: " + text); appendLogRaw(getTimeStamp() + " DEBUG: " + text);
} }
} }
void MainWindow::appendLogError(const QString& text) void MainWindow::appendLogError(const QString& text)
{ {
appendLogRaw("ERROR: " + text); appendLogRaw(getTimeStamp() + " ERROR: " + text);
} }
void MainWindow::appendLogRaw(const QString& text) void MainWindow::appendLogRaw(const QString& text)
@ -492,6 +492,12 @@ bool MainWindow::autoHide()
return false; return false;
} }
QString MainWindow::getTimeStamp()
{
QDateTime current = QDateTime::currentDateTime();
return '[' + current.toString(Qt::ISODate) + ']';
}
void MainWindow::clearLog() void MainWindow::clearLog()
{ {
m_pLogOutput->clear(); m_pLogOutput->clear();

1
src/gui/src/MainWindow.h
View File

@ -174,6 +174,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindowBase
void checkFingerprint(const QString& line); void checkFingerprint(const QString& line);
void checkTransmission(const QString& line); void checkTransmission(const QString& line);
bool autoHide(); bool autoHide();
QString getTimeStamp();
private: private:
QSettings& m_Settings; QSettings& m_Settings;

7
src/lib/base/Log.cpp
View File

@ -174,16 +174,17 @@ Log::print(const char* file, int line, const char* fmt, ...)
char message[kLogMessageLength]; char message[kLogMessageLength];
#ifndef NDEBUG
struct tm *tm; struct tm *tm;
char tmp[220]; char tmp[220];
time_t t; time_t t;
time(&t); time(&t);
tm = localtime(&t); tm = localtime(&t);
sprintf(tmp, "%04i-%02i-%02iT%02i:%02i:%02i", tm->tm_year + 1900, tm->tm_mon+1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec); sprintf(tmp, "%04i-%02i-%02iT%02i:%02i:%02i", tm->tm_year + 1900, tm->tm_mon+1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec);
sprintf(message, "%s %s: %s\n\t%s,%d", tmp, g_priority[priority], buffer, file, line);
#ifndef NDEBUG
sprintf(message, "[%s] %s: %s\n\t%s,%d", tmp, g_priority[priority], buffer, file, line);
#else #else
sprintf(message, "%s: %s", g_priority[priority], buffer); sprintf(message, "[%s] %s: %s", tmp, g_priority[priority], buffer);
#endif #endif
output(priority, message); output(priority, message);