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
Show stats 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 getLogR = page "Logs" Nothing $ do
logfile <- liftAnnex $ fromRepo gitAnnexLogFile logfile <- liftAnnex $ fromRepo gitAnnexLogFile
logs <- liftIO $ listLogs logfile logs <- liftIO $ listLogs logfile
logcontent <- liftIO $ concat <$> mapM readFile logs logcontent <- liftIO $ concat <$> mapM readlog logs
$(widgetFile "control/log") $(widgetFile "control/log")
where
readlog f = withFile f ReadMode $ \h -> do
fileEncoding h -- log may contain invalid utf-8
hClose h `after` hGetContentsStrict h

1
debian/changelog vendored
View file

@ -15,6 +15,7 @@ git-annex (5.20131102) UNRELEASED; urgency=low
exit nonzero at the end. exit nonzero at the end.
* watcher: Avoid loop when adding a file owned by someone else fails * watcher: Avoid loop when adding a file owned by someone else fails
in indirect mode because its permissions cannot be modified. in indirect mode because its permissions cannot be modified.
* webapp: Avoid encoding problems when displaying the daemon log file.
-- Joey Hess <joeyh@debian.org> Sat, 02 Nov 2013 14:54:36 -0400 -- Joey Hess <joeyh@debian.org> Sat, 02 Nov 2013 14:54:36 -0400

2
doc/bugs/internal_server_error:_hGetContents:_invalid_argument___40__invalid_byte_sequence__41__.mdwn
View file

@ -25,3 +25,5 @@ Internal Server Error
git-annex version 4.20131105-g8efdc1a git-annex version 4.20131105-g8efdc1a
# End of transcript or log. # End of transcript or log.
"""]] """]]
> [[fixed|done]] --[[Joey]]