Merge pull request #5940 from fdefelici/fix/win-log-isatty

feat: enable pretty print logging for windows

Author: wileyj

Cargo.lock

@@ -40,7 +40,6 @@ slog = { version = "2.5.2", features = ["max_level_trace"] }
 slog-term = "2.6.0"
 slog-json = { version = "2.3.0", optional = true }
 chrono = "0.4.19"
-libc = "0.2.82"
 hashbrown = { workspace = true }
 rusqlite = { workspace = true, optional = true }
 

stacks-common/Cargo.toml

@@ -225,7 +225,7 @@ fn make_logger() -> Logger {
         let debug = env::var("STACKS_LOG_DEBUG") == Ok("1".into());
         let pretty_print = env::var("STACKS_LOG_PP") == Ok("1".into());
         let decorator = get_decorator();
-        let atty = isatty(Stream::Stderr);
+        let atty = isatty();
         let drain = TermFormat::new(decorator, pretty_print, debug, atty);
         Logger::root(drain.ignore_res(), o!())
     }
@@ -236,11 +236,23 @@ fn get_decorator() -> slog_term::PlainSyncDecorator<slog_term::TestStdoutWriter>
     slog_term::PlainSyncDecorator::new(slog_term::TestStdoutWriter)
 }
 
+#[cfg(any(test, feature = "testing"))]
+fn isatty() -> bool {
+    use std::io::IsTerminal;
+    io::stdout().is_terminal()
+}
+
 #[cfg(not(any(test, feature = "testing")))]
 fn get_decorator() -> slog_term::PlainSyncDecorator<std::io::Stderr> {
     slog_term::PlainSyncDecorator::new(std::io::stderr())
 }
 
+#[cfg(not(any(test, feature = "testing")))]
+fn isatty() -> bool {
+    use std::io::IsTerminal;
+    io::stderr().is_terminal()
+}
+
 fn inner_get_loglevel() -> slog::Level {
     if env::var("STACKS_LOG_TRACE") == Ok("1".into()) {
         slog::Level::Trace
@@ -331,21 +343,17 @@ fn color_if_tty(color: &str, isatty: bool) -> &str {
     }
 }
 
-enum Stream {
-    Stdout,
-    Stderr,
-}
-
-#[cfg(unix)]
-fn isatty(stream: Stream) -> bool {
-    let fd = match stream {
-        Stream::Stdout => libc::STDOUT_FILENO,
-        Stream::Stderr => libc::STDERR_FILENO,
-    };
-    unsafe { libc::isatty(fd) != 0 }
-}
-
-#[cfg(not(unix))]
-fn isatty(stream: Stream) -> bool {
-    false
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    #[ignore = "manual test"]
+    fn test_log_pretty_print() {
+        env::set_var("STACKS_LOG_PP", "1");
+        let logger: Logger = make_logger();
+        slog::slog_info!(logger, "Info test"); //equivalent to info!(..)
+        slog::slog_warn!(logger, "Warn test"); //equivalent to warn!(..)
+        slog::slog_error!(logger, "Erro test"); //equivalent to erro!(..)
+    }
 }