improve name

diff --git a/Annex/Locations.hs b/Annex/Locations.hs
index a407be740ed263b619c3f3d64c9e41274029626d..fdff25b61f201af88832089add7921960a3b59cf 100644 (file)
--- 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 2c35d304a077fd66f6841eb19bbd9f214c172a73..dc91eeca727e72e21dcd385a44e5125ae7504427 100644 (file)
--- 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 8a0e82119dc6487a54ec36aba476209c9eb8eaab..53c9e411c8ad25a3980d9cd3cf7072ea98c8318c 100644 (file)
--- 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")