From f1fcee964fb33ab1a165544f728dcbb1d511657d Mon Sep 17 00:00:00 2001 From: bjorn Date: Tue, 4 Nov 2008 09:28:21 +0000 Subject: [PATCH] pgf-server: write stderr to pgf-error.log, since lighttpd closes stderr for fastcgi processes. --- src/server/FastCGIUtils.hs | 8 ++++++++ src/server/PGFService.hs | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/server/FastCGIUtils.hs b/src/server/FastCGIUtils.hs index 615915787..6fef5112d 100644 --- a/src/server/FastCGIUtils.hs +++ b/src/server/FastCGIUtils.hs @@ -1,6 +1,7 @@ {-# LANGUAGE DeriveDataTypeable #-} module FastCGIUtils (initFastCGI, loopFastCGI, throwCGIError, handleCGIErrors, + stderrToFile, outputJSONP, splitBy) where @@ -110,6 +111,13 @@ restartIfModified = logError :: String -> IO () logError s = hPutStrLn stderr s +stderrToFile :: FilePath -> IO () +stderrToFile file = + do let mode = ownerModes `unionFileModes` groupReadMode `unionFileModes` otherReadMode + fileFd <- openFd file WriteOnly (Just mode) (defaultFileFlags { append = True }) + dupTo fileFd stdError + return () + -- * General CGI Error exception mechanism data CGIError = CGIError { cgiErrorCode :: Int, cgiErrorMessage :: String, cgiErrorText :: [String] } diff --git a/src/server/PGFService.hs b/src/server/PGFService.hs index 3caf36c91..b6a5b8eb6 100644 --- a/src/server/PGFService.hs +++ b/src/server/PGFService.hs @@ -20,9 +20,12 @@ import Data.Maybe import System.Directory import System.FilePath +logFile :: FilePath +logFile = "pgf-error.log" main :: IO () -main = do initFastCGI +main = do stderrToFile logFile + initFastCGI cache <- newCache PGF.readPGF runFastCGIConcurrent' forkIO 100 (handleErrors (handleCGIErrors (cgiMain cache)))