Add log file support to logging.c

This adds the ability for users of logging.c to provide a file handle
for a log file, where log messages are also written in addition to
stderr.

Reviewed-by: Amit Kapila <amit.kapila16@gmail.com>
Discussion: https://www.postgresql.org/message-id/flat/CAEqnbaUthOQARV1dscGvB_EsqC-YfxiM6rWkVDHc%2BG%2Bf4oSUHw%40mail.gmail.com

diff --git a/src/common/logging.c b/src/common/logging.c
index 5206949e5d8c19a30a5cf5f59d0934f800e7b73c..4a69d96281b29a000aee16bd3d388323a8db52da 100644 (file)
--- a/src/common/logging.c
+++ b/src/common/logging.c
@@ -26,6 +26,8 @@ static int    log_flags;
 static void (*log_pre_callback) (void);
 static void (*log_locus_callback) (const char **, uint64 *);
 
+static FILE *log_logfile;
+
 static const char *sgr_error = NULL;
 static const char *sgr_warning = NULL;
 static const char *sgr_note = NULL;
@@ -204,6 +206,18 @@ pg_logging_set_locus_callback(void (*cb) (const char **filename, uint64 *lineno)
        log_locus_callback = cb;
 }
 
+void
+pg_logging_set_logfile(FILE *logfile)
+{
+       log_logfile = logfile;
+}
+
+void
+pg_logging_unset_logfile(void)
+{
+       log_logfile = NULL;
+}
+
 void
 pg_log_generic(enum pg_log_level level, enum pg_log_part part,
                           const char *pg_restrict fmt,...)
@@ -277,6 +291,8 @@ pg_log_generic_v(enum pg_log_level level, enum pg_log_part part,
                                                if (sgr_error)
                                                        fprintf(stderr, ANSI_ESCAPE_FMT, sgr_error);
                                                fprintf(stderr, _("error: "));
+                                               if (log_logfile)
+                                                       fprintf(log_logfile, _("error: "));
                                                if (sgr_error)
                                                        fprintf(stderr, ANSI_ESCAPE_RESET);
                                                break;
@@ -284,6 +300,8 @@ pg_log_generic_v(enum pg_log_level level, enum pg_log_part part,
                                                if (sgr_warning)
                                                        fprintf(stderr, ANSI_ESCAPE_FMT, sgr_warning);
                                                fprintf(stderr, _("warning: "));
+                                               if (log_logfile)
+                                                       fprintf(log_logfile, _("warning: "));
                                                if (sgr_warning)
                                                        fprintf(stderr, ANSI_ESCAPE_RESET);
                                                break;
@@ -295,6 +313,8 @@ pg_log_generic_v(enum pg_log_level level, enum pg_log_part part,
                                if (sgr_note)
                                        fprintf(stderr, ANSI_ESCAPE_FMT, sgr_note);
                                fprintf(stderr, _("detail: "));
+                               if (log_logfile)
+                                       fprintf(log_logfile, _("detail: "));
                                if (sgr_note)
                                        fprintf(stderr, ANSI_ESCAPE_RESET);
                                break;
@@ -302,6 +322,8 @@ pg_log_generic_v(enum pg_log_level level, enum pg_log_part part,
                                if (sgr_note)
                                        fprintf(stderr, ANSI_ESCAPE_FMT, sgr_note);
                                fprintf(stderr, _("hint: "));
+                               if (log_logfile)
+                                       fprintf(log_logfile, _("hint: "));
                                if (sgr_note)
                                        fprintf(stderr, ANSI_ESCAPE_RESET);
                                break;
@@ -332,6 +354,11 @@ pg_log_generic_v(enum pg_log_level level, enum pg_log_part part,
                buf[required_len - 2] = '\0';
 
        fprintf(stderr, "%s\n", buf);
+       if (log_logfile)
+       {
+               fprintf(log_logfile, "%s\n", buf);
+               fflush(log_logfile);
+       }
 
        free(buf);
 }

diff --git a/src/include/common/logging.h b/src/include/common/logging.h
index bccba4ac07b51b0362f9891521c9bac5e9ca72ef..06c202dbe2de36c87952676d0829dde92b8d85be 100644 (file)
--- a/src/include/common/logging.h
+++ b/src/include/common/logging.h
@@ -91,6 +91,8 @@ void          pg_logging_set_level(enum pg_log_level new_level);
 void           pg_logging_increase_verbosity(void);
 void           pg_logging_set_pre_callback(void (*cb) (void));
 void           pg_logging_set_locus_callback(void (*cb) (const char **filename, uint64 *lineno));
+void           pg_logging_set_logfile(FILE *logfile);
+void           pg_logging_unset_logfile(void);
 
 void           pg_log_generic(enum pg_log_level level, enum pg_log_part part,
                                                   const char *pg_restrict fmt,...)