From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 20 Oct 2020 19:06:55 +0000 (-0400)
Subject: improve name
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~106^2~71
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=62d630272e8da8ec63a1ce07b06462d6ced4d934;p=git-annex.git

improve name
---

diff --git a/Annex/Locations.hs b/Annex/Locations.hs
index a407be740e..fdff25b61f 100644
--- a/Annex/Locations.hs
+++ b/Annex/Locations.hs
@@ -76,7 +76,7 @@ module Annex.Locations (
 	gitAnnexPidFile,
 	gitAnnexPidLockFile,
 	gitAnnexDaemonStatusFile,
-	gitAnnexLogFile,
+	gitAnnexDaemonLogFile,
 	gitAnnexFuzzTestLogFile,
 	gitAnnexHtmlShim,
 	gitAnnexUrlFile,
@@ -513,8 +513,8 @@ gitAnnexDaemonStatusFile r = fromRawFilePath $
 	gitAnnexDir r P.</> "daemon.status"
 
 {- Log file for daemon mode. -}
-gitAnnexLogFile :: Git.Repo -> FilePath
-gitAnnexLogFile r = fromRawFilePath $ gitAnnexDir r P.</> "daemon.log"
+gitAnnexDaemonLogFile :: Git.Repo -> FilePath
+gitAnnexDaemonLogFile r = fromRawFilePath $ gitAnnexDir r P.</> "daemon.log"
 
 {- Log file for fuzz test. -}
 gitAnnexFuzzTestLogFile :: Git.Repo -> FilePath
diff --git a/Assistant/Threads/SanityChecker.hs b/Assistant/Threads/SanityChecker.hs
index 2c35d304a0..dc91eeca72 100644
--- a/Assistant/Threads/SanityChecker.hs
+++ b/Assistant/Threads/SanityChecker.hs
@@ -221,7 +221,7 @@ hourlyCheck = do
  -}
 checkLogSize :: Int -> Assistant ()
 checkLogSize n = do
-	f <- liftAnnex $ fromRepo gitAnnexLogFile
+	f <- liftAnnex $ fromRepo gitAnnexDaemonLogFile
 	logs <- liftIO $ listLogs f
 	totalsize <- liftIO $ sum <$> mapM getFileSize logs
 	when (totalsize > 2 * oneMegabyte) $ do
diff --git a/Assistant/WebApp/Control.hs b/Assistant/WebApp/Control.hs
index 8a0e82119d..53c9e411c8 100644
--- a/Assistant/WebApp/Control.hs
+++ b/Assistant/WebApp/Control.hs
@@ -72,7 +72,7 @@ getRestartThreadR name = do
 
 getLogR :: Handler Html
 getLogR = page "Logs" Nothing $ do
-	logfile <- liftAnnex $ fromRepo gitAnnexLogFile
+	logfile <- liftAnnex $ fromRepo gitAnnexDaemonLogFile
 	logs <- liftIO $ listLogs logfile
 	logcontent <- liftIO $ concat <$> mapM readFile logs
 	$(widgetFile "control/log")