From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 28 Jun 2017 18:24:27 +0000 (-0400)
Subject: Log real error message when unable to remove a storagedir file
X-Git-Tag: tor-0.3.1.4-alpha~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a088a08eeb076a80dfe3392bf913a955ac1bd4e6;p=thirdparty%2Ftor.git

Log real error message when unable to remove a storagedir file

Attempts to help diagnose 22752.
---

diff --git a/src/common/storagedir.c b/src/common/storagedir.c
index 4405731884..31933f64c2 100644
--- a/src/common/storagedir.c
+++ b/src/common/storagedir.c
@@ -119,7 +119,8 @@ storage_dir_clean_tmpfiles(storage_dir_t *d)
     char *path = NULL;
     tor_asprintf(&path, "%s/%s", d->directory, fname);
     if (unlink(sandbox_intern_string(path))) {
-      log_warn(LD_FS, "Unable to unlink %s", escaped(path));
+      log_warn(LD_FS, "Unable to unlink %s while cleaning "
+               "temporary files: %s", escaped(path), strerror(errno));
       tor_free(path);
       continue;
     }
@@ -455,7 +456,8 @@ storage_dir_remove_file(storage_dir_t *d,
   if (unlink(ipath) == 0) {
     storage_dir_reduce_usage(d, size);
   } else {
-    log_warn(LD_FS, "Unable to unlink %s", escaped(path));
+    log_warn(LD_FS, "Unable to unlink %s while removing file: %s",
+             escaped(path), strerror(errno));
     tor_free(path);
     return;
   }