mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

webapp: Avoid encoding problems when displaying the daemon log file.

Browse source
This commit is contained in:
Joey Hess 2013-11-07 15:29:20 -04:00
parent 09abd29469
commit b7c15f3b60
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Assistant/WebApp/Control.hs
View file

@ -67,5 +67,9 @@ getLogR :: Handler Html
getLogR = page "Logs" Nothing $ do
logfile <- liftAnnex $ fromRepo gitAnnexLogFile
logs <- liftIO $ listLogs logfile
logcontent <- liftIO $ concat <$> mapM readFile logs
logcontent <- liftIO $ concat <$> mapM readlog logs
$(widgetFile "control/log")
where
readlog f = withFile f ReadMode $ \h -> do
fileEncoding h -- log may contain invalid utf-8
hClose h `after` hGetContentsStrict h