From 74df0fb84bc00bc39ef78b68335c4c62fb1ccc29 Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Tue, 25 Oct 2011 23:40:51 +0300
Subject: [PATCH] Fixed logging output and LOG_SHORT macro

---
 base/logging.cpp         | 2 +-
 base/src_point.hpp       | 5 +++--
 map/framework.hpp        | 4 ++--
 qt/main.cpp              | 7 +++----
 words/sloynik_engine.cpp | 2 +-
 yg/resource_manager.cpp  | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/base/logging.cpp b/base/logging.cpp
index 4c26cd8f2a..7a3b3b9073 100644
--- a/base/logging.cpp
+++ b/base/logging.cpp
@@ -46,7 +46,7 @@ namespace my
     double const sec = s_Timer.ElapsedSeconds();
     out << " " << std::setfill(' ') << std::setw(16 - len[level]) << sec;
 
-    out << " " << srcPoint.FileName() << ":" << srcPoint.Line() << " " << srcPoint.Function() << "() " << msg << endl;
+    out << " " << DebugPrint(srcPoint) << msg << endl;
 
     string const outString = out.str();
     std::cerr << outString;
diff --git a/base/src_point.hpp b/base/src_point.hpp
index 102e796d89..72d5f87af0 100644
--- a/base/src_point.hpp
+++ b/base/src_point.hpp
@@ -19,7 +19,7 @@ namespace my
   class SrcPoint
   {
   public:
-    SrcPoint() : m_FileName("X"), m_Line(-1), m_Function("X")
+    SrcPoint() : m_FileName(""), m_Line(-1), m_Function("")
     {
       TruncateFileName();
     }
@@ -69,7 +69,8 @@ namespace my
 inline string DebugPrint(my::SrcPoint const & srcPoint)
 {
     ostringstream out;
-    out << srcPoint.FileName() << ":" << srcPoint.Line() << " " << srcPoint.Function() << "()";
+    if (srcPoint.Line() > 0)
+      out << srcPoint.FileName() << ":" << srcPoint.Line() << " " << srcPoint.Function() << "()";
     return out.str();
 }
 
diff --git a/map/framework.hpp b/map/framework.hpp
index 58415838aa..3640531f48 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -157,13 +157,13 @@ public:
 
     enumMapsFn = bind(&Framework::EnumLocalMaps, this, _1);
 
-    LOG(LINFO, ("Initializing storage"));
+    LOG(LDEBUG, ("Initializing storage"));
     // initializes model with locally downloaded maps
     storage.Init(bind(&Framework::AddMap, this, _1),
                  bind(&Framework::RemoveMap, this, _1),
                  bind(&Framework::InvalidateRect, this, _1),
                  enumMapsFn);
-    LOG(LINFO, ("Storage initialized"));
+    LOG(LDEBUG, ("Storage initialized"));
   }
 
   bool IsEmptyModel();
diff --git a/qt/main.cpp b/qt/main.cpp
index a0726c25d4..614aa6a791 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -73,14 +73,13 @@ namespace
 #endif
 }
 
-int main(int argc, char *argv[])
+int main(int argc, char * argv[])
 {
   InitializeFinalize mainGuard;
   UNUSED_VALUE(mainGuard);
 
-  LOG(LINFO, ("MapsWithMe started"));
-  LOG(LINFO, ("Version : ", VERSION_STRING));
-  LOG(LINFO, ("Built on : ", VERSION_DATE_STRING));
+  LOG_SHORT(LINFO, ("Started MapsWithMe version", VERSION_STRING));
+  LOG_SHORT(LINFO, ("Built on", VERSION_DATE_STRING));
 
   QApplication a(argc, argv);
 
diff --git a/words/sloynik_engine.cpp b/words/sloynik_engine.cpp
index 379a65ba7f..73377fdc37 100644
--- a/words/sloynik_engine.cpp
+++ b/words/sloynik_engine.cpp
@@ -45,7 +45,7 @@ sl::SloynikEngine::SloynikEngine(string const & dictionary,
     needIndexBuild = true;
   }
 
-  LOG(LINFO, ("Started sloynik engine. Words in the dictionary:", m_pDictionary->KeyCount()));
+  LOG(LDEBUG, ("Started sloynik engine. Words in the dictionary:", m_pDictionary->KeyCount()));
 
   // Uncomment to always rebuild the index: needIndexBuild = true;
   if (needIndexBuild)
diff --git a/yg/resource_manager.cpp b/yg/resource_manager.cpp
index 89500d6d4e..6fbbcde839 100644
--- a/yg/resource_manager.cpp
+++ b/yg/resource_manager.cpp
@@ -57,7 +57,7 @@ namespace yg
                                      m_format(fmt),
                                      m_useVA(useVA)
   {
-    LOG(LINFO, ("allocating ", glyphCacheCount, " glyphCaches, ", glyphCacheSize, " bytes total."));
+    LOG(LDEBUG, ("allocating ", glyphCacheCount, " glyphCaches, ", glyphCacheSize, " bytes total."));
 
     for (size_t i = 0; i < glyphCacheCount; ++i)
       m_glyphCaches.push_back(GlyphCache(GlyphCache::Params(blocksFile, whiteListFile, blackListFile, glyphCacheSize / glyphCacheCount)));