From 777e13b94b2da466c16a5836b52413aa9d246cd5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 22 Mar 2004 20:53:49 +0000 Subject: * Nix now has three different formats for the log information it writes to stderr: - `pretty': the old nested style (default) - `escapes': uses escape codes to indicate nesting and message level; can be processed using `log2xml' - `flat': just plain text, no nesting These can be set using `--log-type TYPE' or the NIX_LOG_TYPE environment variable. --- src/libmain/shared.cc | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'src/libmain') diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index ec639052b5c8..a93d6cb50186 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -18,6 +18,15 @@ void sigintHandler(int signo) } +void setLogType(string lt) +{ + if (lt == "pretty") logType = ltPretty; + else if (lt == "escapes") logType = ltEscapes; + else if (lt == "flat") logType = ltFlat; + else throw UsageError("unknown log type"); +} + + /* Initialize and reorder arguments, then call the actual argument processor. */ static void initAndRun(int argc, char * * argv) @@ -44,6 +53,10 @@ static void initAndRun(int argc, char * * argv) if (sigaction(SIGINT, &act, &oact)) throw SysError("installing handler for SIGINT"); + /* Process the NIX_LOG_TYPE environment variable. */ + char * lt = getenv("NIX_LOG_TYPE"); + if (lt) setLogType(lt); + /* Put the arguments in a vector. */ Strings args, remaining; while (argc--) args.push_back(*argv++); @@ -72,7 +85,11 @@ static void initAndRun(int argc, char * * argv) string arg = *i; if (arg == "--verbose" || arg == "-v") verbosity = (Verbosity) ((int) verbosity + 1); - else if (arg == "--build-output" || arg == "-B") + else if (arg == "--log-type") { + ++i; + if (i == args.end()) throw UsageError("`--log-type' requires an argument"); + setLogType(*i); + } else if (arg == "--build-output" || arg == "-B") buildVerbosity = lvlError; /* lowest */ else if (arg == "--help") { printHelp(); -- cgit 1.4.1