From c229cdeba24a846a50ae0ed421aa5ed1e8c2af0c Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Fri, 1 Apr 2016 17:19:17 +0300
Subject: [PATCH] Detailed exceptions description while creating gps track
 file.

---
 map/gps_track.cpp         | 12 ++++++------
 map/gps_track_storage.cpp | 13 +++++++------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/map/gps_track.cpp b/map/gps_track.cpp
index a1823d7333..f87e456f41 100644
--- a/map/gps_track.cpp
+++ b/map/gps_track.cpp
@@ -154,9 +154,9 @@ void GpsTrack::InitStorageIfNeed()
   {
     m_storage = make_unique<GpsTrackStorage>(m_filePath, m_maxItemCount);
   }
-  catch (RootException & e)
+  catch (RootException const & e)
   {
-    LOG(LINFO, ("Storage has not been created:", e.Msg()));
+    LOG(LWARNING, ("Track storage creation error:", e.Msg()));
   }
 }
 
@@ -203,9 +203,9 @@ void GpsTrack::InitCollection(hours duration)
       m_collection->Add(points, evictedIds);
     }
   }
-  catch (RootException & e)
+  catch (RootException const & e)
   {
-    LOG(LINFO, ("Storage has caused exception:", e.Msg()));
+    LOG(LWARNING, ("Track storage exception:", e.Msg()));
     m_collection->Clear();
     m_storage.reset();
   }
@@ -266,9 +266,9 @@ void GpsTrack::UpdateStorage(bool needClear, vector<location::GpsInfo> const & p
 
     m_storage->Append(points);
   }
-  catch (RootException & e)
+  catch (RootException const & e)
   {
-    LOG(LINFO, ("Storage has caused exception:", e.Msg()));
+    LOG(LWARNING, ("Track storage exception:", e.Msg()));
     m_storage.reset();
   }
 }
diff --git a/map/gps_track_storage.cpp b/map/gps_track_storage.cpp
index 1ffcb57a6d..115bb4370b 100644
--- a/map/gps_track_storage.cpp
+++ b/map/gps_track_storage.cpp
@@ -116,23 +116,24 @@ GpsTrackStorage::GpsTrackStorage(string const & filePath, size_t maxItemCount)
   {
     uint32_t version = 0;
     if (!ReadVersion(m_stream, version))
-      MYTHROW(OpenException, ("File:", m_filePath));
+      MYTHROW(OpenException, ("Read version error.", m_filePath));
 
     if (version == kCurrentVersion)
     {
       // Seek to end to get file size
       m_stream.seekp(0, ios::end);
       if (!m_stream.good())
-        MYTHROW(OpenException, ("File:", m_filePath));
+        MYTHROW(OpenException, ("Seek to the end error.", m_filePath));
 
       size_t const fileSize = m_stream.tellp();
 
       m_itemCount = GetItemCount(fileSize);
 
       // Set write position after last item position
-      m_stream.seekp(GetItemOffset(m_itemCount), ios::beg);
+      size_t const offset = GetItemOffset(m_itemCount);
+      m_stream.seekp(offset, ios::beg);
       if (!m_stream.good())
-        MYTHROW(OpenException, ("File:", m_filePath));
+        MYTHROW(OpenException, ("Seek to the offset error:", offset, m_filePath));
     }
     else
     {
@@ -148,10 +149,10 @@ GpsTrackStorage::GpsTrackStorage(string const & filePath, size_t maxItemCount)
     m_stream.open(m_filePath, ios::in | ios::out | ios::binary | ios::trunc);
 
     if (!m_stream)
-      MYTHROW(OpenException, ("File:", m_filePath));
+      MYTHROW(OpenException, ("Open file error.", m_filePath));
 
     if (!WriteVersion(m_stream, kCurrentVersion))
-      MYTHROW(OpenException, ("File:", m_filePath));
+      MYTHROW(OpenException, ("Write version error.", m_filePath));
 
     m_itemCount = 0;
   }