commit 38a0473a2308a49e785dd3560e6db3795d87ddfe
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jan 28 17:40:21 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jan 28 17:40:21 2013 -0800
tree 7a8dcf9337794b5c544d73f798d32a4035b75f32
parent 583449a6766eb4b580f54e4230d3abb5d4f7858f

Handling the case when file is moved fast several times (permissions may throw an exception)

src/dispatcher.cc

diff --git a/src/dispatcher.cc b/src/dispatcher.cc
index 9bee6cb..b5e5668 100644
--- a/src/dispatcher.cc
+++ b/src/dispatcher.cc
@@ -155,12 +155,19 @@
   HashPtr hash;
   tie (hash, seg_num) = m_objectManager.localFileToObjects (absolutePath, m_localUserName);
 
-  m_actionLog->AddLocalActionUpdate (relativeFilePath.generic_string(),
-                                     *hash,
-                                     last_write_time (absolutePath), status (absolutePath).permissions (), seg_num);
+  try
+    {
+      m_actionLog->AddLocalActionUpdate (relativeFilePath.generic_string(),
+                                         *hash,
+                                         last_write_time (absolutePath), status (absolutePath).permissions (), seg_num);
 
-  // notify SyncCore to propagate the change
-  m_core->localStateChanged();
+      // notify SyncCore to propagate the change
+      m_core->localStateChanged();
+    }
+  catch (filesystem::filesystem_error &error)
+    {
+      _LOG_ERROR ("File operations failed on [" << relativeFilePath << "] (ignoring)");
+    }
 }
 
 void
@@ -176,7 +183,7 @@
   if (filesystem::exists(absolutePath))
     {
       //BOOST_THROW_EXCEPTION (Error::Dispatcher() << error_info_str("Delete notification but file exists: " + absolutePath.string() ));
-      _LOG_DEBUG("DELETE command, but file still exists: " << absolutePath.string());
+      _LOG_ERROR("DELETE command, but file still exists: " << absolutePath.string());
       return;
     }