Skip to content

Commit 1a031e3

Browse files
committed
Write debug output to stderr
1 parent cff9b1a commit 1a031e3

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

Cabal/src/Distribution/Simple/Utils.hs

+22-26
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ topHandlerWith cont prog = do
423423
handle se = do
424424
hFlush stdout
425425
pname <- getProgName
426-
hPutStr stderr (message pname se)
426+
putErr (message pname se)
427427
cont se
428428

429429
message :: String -> Exception.SomeException -> String
@@ -457,11 +457,6 @@ displaySomeException se =
457457
topHandler :: IO a -> IO a
458458
topHandler prog = topHandlerWith (const $ exitWith (ExitFailure 1)) prog
459459

460-
verbosityHandle :: Verbosity -> Handle
461-
verbosityHandle verbosity
462-
| isVerboseStderr verbosity = stderr
463-
| otherwise = stdout
464-
465460
-- | Non fatal conditions that may be indicative of an error or problem.
466461
--
467462
-- We display these at the 'normal' verbosity level.
@@ -471,9 +466,10 @@ warn verbosity msg = withFrozenCallStack $ do
471466
when ((verbosity >= normal) && not (isVerboseNoWarn verbosity)) $ do
472467
ts <- getPOSIXTime
473468
hFlush stdout
474-
hPutStr stderr . withMetadata ts NormalMark FlagTrace verbosity
475-
. wrapTextVerbosity verbosity
476-
$ "Warning: " ++ msg
469+
putErr
470+
. withMetadata ts NormalMark FlagTrace verbosity
471+
. wrapTextVerbosity verbosity
472+
$ "Warning: " ++ msg
477473

478474
-- | Useful status messages.
479475
--
@@ -485,9 +481,8 @@ warn verbosity msg = withFrozenCallStack $ do
485481
notice :: Verbosity -> String -> IO ()
486482
notice verbosity msg = withFrozenCallStack $ do
487483
when (verbosity >= normal) $ do
488-
let h = verbosityHandle verbosity
489484
ts <- getPOSIXTime
490-
hPutStr h
485+
putErr
491486
$ withMetadata ts NormalMark FlagTrace verbosity
492487
$ wrapTextVerbosity verbosity
493488
$ msg
@@ -498,19 +493,17 @@ notice verbosity msg = withFrozenCallStack $ do
498493
noticeNoWrap :: Verbosity -> String -> IO ()
499494
noticeNoWrap verbosity msg = withFrozenCallStack $ do
500495
when (verbosity >= normal) $ do
501-
let h = verbosityHandle verbosity
502496
ts <- getPOSIXTime
503-
hPutStr h . withMetadata ts NormalMark FlagTrace verbosity $ msg
497+
putErr . withMetadata ts NormalMark FlagTrace verbosity $ msg
504498

505499
-- | Pretty-print a 'Disp.Doc' status message at 'normal' verbosity
506500
-- level. Use this if you need fancy formatting.
507501
--
508502
noticeDoc :: Verbosity -> Disp.Doc -> IO ()
509503
noticeDoc verbosity msg = withFrozenCallStack $ do
510504
when (verbosity >= normal) $ do
511-
let h = verbosityHandle verbosity
512505
ts <- getPOSIXTime
513-
hPutStr h
506+
putErr
514507
$ withMetadata ts NormalMark FlagTrace verbosity
515508
$ Disp.renderStyle defaultStyle
516509
$ msg
@@ -529,34 +522,38 @@ setupMessage verbosity msg pkgid = withFrozenCallStack $ do
529522
info :: Verbosity -> String -> IO ()
530523
info verbosity msg = withFrozenCallStack $
531524
when (verbosity >= verbose) $ do
532-
let h = verbosityHandle verbosity
533525
ts <- getPOSIXTime
534-
hPutStr h
526+
putErr
535527
$ withMetadata ts NeverMark FlagTrace verbosity
536528
$ wrapTextVerbosity verbosity
537529
$ msg
538530

539531
infoNoWrap :: Verbosity -> String -> IO ()
540532
infoNoWrap verbosity msg = withFrozenCallStack $
541533
when (verbosity >= verbose) $ do
542-
let h = verbosityHandle verbosity
543534
ts <- getPOSIXTime
544-
hPutStr h
535+
putErr
545536
$ withMetadata ts NeverMark FlagTrace verbosity
546537
$ msg
547538

539+
putErr :: String -> IO ()
540+
putErr = hPutStr stderr
541+
542+
putErrLn :: String -> IO ()
543+
putErrLn = hPutStrLn stderr
544+
548545
-- | Detailed internal debugging information
549546
--
550547
-- We display these messages when the verbosity level is 'deafening'
551548
--
552549
debug :: Verbosity -> String -> IO ()
553550
debug verbosity msg = withFrozenCallStack $
554551
when (verbosity >= deafening) $ do
555-
let h = verbosityHandle verbosity
556552
ts <- getPOSIXTime
557-
hPutStr h $ withMetadata ts NeverMark FlagTrace verbosity
558-
$ wrapTextVerbosity verbosity
559-
$ msg
553+
putErr
554+
$ withMetadata ts NeverMark FlagTrace verbosity
555+
$ wrapTextVerbosity verbosity
556+
$ msg
560557
-- ensure that we don't lose output if we segfault/infinite loop
561558
hFlush stdout
562559

@@ -565,9 +562,8 @@ debug verbosity msg = withFrozenCallStack $
565562
debugNoWrap :: Verbosity -> String -> IO ()
566563
debugNoWrap verbosity msg = withFrozenCallStack $
567564
when (verbosity >= deafening) $ do
568-
let h = verbosityHandle verbosity
569565
ts <- getPOSIXTime
570-
hPutStr h
566+
putErr
571567
$ withMetadata ts NeverMark FlagTrace verbosity
572568
$ msg
573569
-- ensure that we don't lose output if we segfault/infinite loop
@@ -580,7 +576,7 @@ chattyTry :: String -- ^ a description of the action we were attempting
580576
-> IO ()
581577
chattyTry desc action =
582578
catchIO action $ \exception ->
583-
hPutStrLn stderr $ "Error while " ++ desc ++ ": " ++ show exception
579+
putErrLn $ "Error while " ++ desc ++ ": " ++ show exception
584580

585581
-- | Run an IO computation, returning @e@ if it raises a "file
586582
-- does not exist" error.

Cabal/src/Distribution/Verbosity.hs

+1
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ isVerboseTimestamp = isVerboseFlag VTimestamp
343343
-- @since 3.4.0.0
344344
isVerboseStderr :: Verbosity -> Bool
345345
isVerboseStderr = isVerboseFlag VStderr
346+
{-# DEPRECATED isVerboseStderr "Cabal output should generally not go to stdout." #-}
346347

347348
-- | Test if we should output warnings when we log.
348349
isVerboseNoWarn :: Verbosity -> Bool

changelog.d/issue-7790

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
synopsis: `cabal run` should send info logging to stderr not stdout
2+
packages: Cabal
3+
issues: #7790

0 commit comments

Comments
 (0)