From b236c46dbb20cfbb42201b7cccdaa153b7bd2ed1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 15 Jan 2013 13:34:59 -0400 Subject: webapp: Now always logs to .git/annex/daemon.log It used to not log to daemon.log when a repository was first created, and when starting the webapp. Now both do. Redirecting stdout and stderr to the log is tricky when starting the webapp, because the web browser may want to communicate with the user. (Either a console web browser, or web.browser = echo) This is handled by restoring the original fds when running the browser. --- Utility/WebApp.hs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'Utility/WebApp.hs') diff --git a/Utility/WebApp.hs b/Utility/WebApp.hs index 51300c9cf..c6aae9db5 100644 --- a/Utility/WebApp.hs +++ b/Utility/WebApp.hs @@ -40,16 +40,12 @@ import Control.Concurrent localhost :: String localhost = "localhost" -{- Runs a web browser on a given url. - - - - Note: The url *will* be visible to an attacker. -} -runBrowser :: String -> (Maybe [(String, String)]) -> IO Bool -runBrowser url env = boolSystemEnv cmd [Param url] env - where +{- Command to use to run a web browser. -} +browserCommand :: FilePath #ifdef darwin_HOST_OS - cmd = "open" +browserCommand = "open" #else - cmd = "xdg-open" +browserCommand = "xdg-open" #endif {- Binds to a socket on localhost, and runs a webapp on it. -- cgit v1.2.3