Merge branch 'fix-log-verbosity'

* Branch commit log: ase/main.cc: log exit status to logfile only ase/logging: add logtxt() Signed-off-by: Tim Janik <[email protected]>
tim-janik · Jun 19, 2024 · a10b18e · a10b18e
2 parents 5f8b8ee + fea5a71
commit a10b18e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/ase/logging.cc b/ase/logging.cc
@@ -91,6 +91,8 @@ logmsg (const char c, const String &dept, const String &msg)
   for (auto fd : log_fds (c == 'E')) {
     if (fd == 1) fflush (stdout);
     if (fd == 2) fflush (stderr);
+    if (c == 'T' && fd <= 2)
+      continue;
     write (fd, s.data(), s.size());
     // fdatasync (fd);
   }

diff --git a/ase/logging.hh b/ase/logging.hh
@@ -16,11 +16,22 @@ void                      log_setup (bool inf2stderr, bool log2file);
 
 // == Impl ==
 void logmsg (const char c, const String &dept, const String &msg);
+
+/// Log text into logfile only.
+template<class... A> void
+logtxt (const char *format, const A &...args)
+{
+  logmsg ('T', "", string_format (format, args...).c_str());
+}
+
+/// Log info to logfile (and stderr for some configs)
 template<class... A> void
 loginf (const char *format, const A &...args)
 {
   logmsg ('I', "", string_format (format, args...).c_str());
 }
+
+/// Log error to stderr and logfile.
 template<class... A> void
 logerr (const String &dept, const char *format, const A &...args)
 {

diff --git a/ase/main.cc b/ase/main.cc
@@ -631,7 +631,7 @@ main (int argc, char *argv[])
   // run main event loop and catch SIGUSR2
   const int exitcode = main_loop->run();
   assert_return (main_loop, -1); // ptr must be kept around
-  loginf ("main loop quit (code=%d)", exitcode);
+  logtxt ("main loop quit (code=%d)", exitcode);
 
   // cleanup
   wss->shutdown(); // close socket, allow no more calls
@@ -644,7 +644,7 @@ main (int argc, char *argv[])
   main_loop->iterate_pending();
   main_config_.engine = nullptr;
 
-  loginf ("exiting: %d", exitcode);
+  logtxt ("exiting: %d", exitcode);
   return exitcode;
 }