Mercurial > hg > bitcoin

changeset 2697:6fcf025a464b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #1370 from Diapolo/add_startuptime_to_log add client startup time as an entry to debug.log
author Pieter Wuille <pieter.wuille@gmail.com>
date Sat, 26 May 2012 01:55:17 -0700
parents 426e6bf113de (current diff) eb323c3694cb (diff)
children 19e29b1fcdee
files
diffstat 4 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -414,6 +414,7 @@
         ShrinkDebugFile();
     printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
     printf("Bitcoin version %s (%s)\n", FormatFullVersion().c_str(), CLIENT_DATE.c_str());
+    printf("Startup time: %s\n", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str());
     printf("Default data directory %s\n", GetDefaultDataDir().string().c_str());
     std::ostringstream strErrors;
 
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -130,9 +130,9 @@
     return QString::fromStdString(CLIENT_NAME);
 }
 
-QDateTime ClientModel::formatClientStartupTime() const
+QString ClientModel::formatClientStartupTime() const
 {
-    return QDateTime::fromTime_t(nClientStartupTime);
+    return QDateTime::fromTime_t(nClientStartupTime).toString();
 }
 
 // Handlers for core signals
--- a/src/qt/clientmodel.h
+++ b/src/qt/clientmodel.h
@@ -41,7 +41,7 @@
     QString formatFullVersion() const;
     QString formatBuildDate() const;
     QString clientName() const;
-    QDateTime formatClientStartupTime() const;
+    QString formatClientStartupTime() const;
 
 private:
     OptionsModel *optionsModel;
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -163,7 +163,7 @@
         ui->clientVersion->setText(model->formatFullVersion());
         ui->clientName->setText(model->clientName());
         ui->buildDate->setText(model->formatBuildDate());
-        ui->startupTime->setText(model->formatClientStartupTime().toString());
+        ui->startupTime->setText(model->formatClientStartupTime());
 
         setNumConnections(model->getNumConnections());
         ui->isTestNet->setChecked(model->isTestNet());