Improve error messages on scan errors

gerbera · Oct 6, 2023 · 60ce3fc · 60ce3fc
1 parent 5aef816
commit 60ce3fc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/content/autoscan_inotify.cc b/src/content/autoscan_inotify.cc
@@ -497,7 +497,7 @@ void AutoscanInotify::monitorUnmonitorRecursive(const fs::directory_entry& start
         }
 
         if (ec) {
-            log_error("monitorUnmonitorRecursive: Failed to read {}, {}", dirEnt.path().c_str(), ec.message());
+            log_error("AutoscanInotify::monitorUnmonitorRecursive {}: Failed to read {}, {}", startPath.path().c_str(), dirEnt.path().c_str(), ec.message());
         }
     }
 }

diff --git a/src/content/content_manager.cc b/src/content/content_manager.cc
@@ -817,7 +817,7 @@ void ContentManager::_rescanDirectory(const std::shared_ptr<AutoscanDirectory>&
                 }
             }
             if (ec) {
-                log_error("_rescanDirectory: Failed to read {}, {}", newPath.c_str(), ec.message());
+                log_error("ContentManager::_rescanDirectory {}: Failed to read {}, {}", location.c_str(), newPath.c_str(), ec.message());
             }
         } // dIter
 

diff --git a/src/content/import_service.cc b/src/content/import_service.cc
@@ -265,9 +265,11 @@ void ImportService::readDir(const fs::path& location, AutoScanSetting& settings)
                 readDir(entryPath, settings);
             } else {
                 contentStateCache[entryPath]->setObject(ImportState::Broken, nullptr);
+                log_error("ImportService::readDir {}: Failed to read {}, {}", location.c_str(), entryPath.c_str(), ec.message());
             }
         } else if (ec) {
             contentStateCache[entryPath]->setObject(ImportState::Broken, nullptr);
+            log_error("ImportService::readDir {}: Failed to read {}, {}", location.c_str(), entryPath.c_str(), ec.message());
         }
     }
     log_debug("end {}", location.string());
@@ -282,7 +284,7 @@ void ImportService::readFile(const fs::path& location)
         dirEntry.assign(entryPath.parent_path(), ec);
         if (ec) {
             contentStateCache[entryPath]->setObject(ImportState::Broken, nullptr);
-            log_error("Failed to navigate up {}, {}", entryPath.c_str(), ec.message());
+            log_error("ImportService::readFile {}: Failed to navigate up {}, {}", location.c_str(), entryPath.c_str(), ec.message());
             break;
         }
         entryPath = dirEntry.path();