Added --log parameter, each log entry has timestamp value now

Author: Arthur Zakirov

src/configure.c

@@ -41,8 +41,10 @@ do_configure(bool show_only)
 	if (replica_timeout != 300)		/* 300 is default value */
 		config->replica_timeout = replica_timeout;
 
-	if (log_level_defined)
-		config->log_level = log_level;
+	if (log_to_file != LOGGER_NONE)
+		config->log_to_file = LOG_TO_FILE;
+	if (log_level != LOGGER_NONE)
+		config->log_level = LOG_LEVEL;
 	if (log_filename)
 		config->log_filename = log_filename;
 	if (error_log_filename)
@@ -88,6 +90,7 @@ pgBackupConfigInit(pgBackupConfig *config)
 	config->master_user = NULL;
 	config->replica_timeout = INT_MIN;	/* INT_MIN means "undefined" */
 
+	config->log_to_file = INT_MIN;		/* INT_MIN means "undefined" */
 	config->log_level = INT_MIN;		/* INT_MIN means "undefined" */
 	config->log_filename = NULL;
 	config->error_log_filename = NULL;
@@ -132,6 +135,8 @@ writeBackupCatalogConfig(FILE *out, pgBackupConfig *config)
 		fprintf(out, "replica_timeout = %d\n", config->replica_timeout);
 
 	fprintf(out, "#Logging parameters:\n");
+	if (config->log_to_file != INT_MIN)
+		fprintf(out, "log = %d\n", config->log_to_file);
 	if (config->log_level != INT_MIN)
 		fprintf(out, "log-level = %s\n", deparse_log_level(config->log_level));
 	if (config->log_filename)
@@ -193,12 +198,13 @@ readBackupCatalogConfigFile(void)
 		{ 'f', 36, "compress-algorithm",	opt_compress_alg,				SOURCE_CMDLINE },
 		{ 'u', 37, "compress-level",		&(config->compress_level),		SOURCE_CMDLINE },
 		/* logging options */
-		{ 'f', 40, "log-level",				opt_log_level,					SOURCE_CMDLINE },
-		{ 's', 41, "log-filename",			&(config->log_filename),		SOURCE_CMDLINE },
-		{ 's', 42, "error-log-filename",	&(config->error_log_filename),	SOURCE_CMDLINE },
-		{ 's', 43, "log-directory",			&(config->log_directory),		SOURCE_CMDLINE },
-		{ 'u', 44, "log-rotation-size",		&(config->log_rotation_size),	SOURCE_CMDLINE },
-		{ 'u', 45, "log-rotation-age",		&(config->log_rotation_age),	SOURCE_CMDLINE },
+		{ 'i', 0, "log",					&(config->log_to_file),			SOURCE_CMDLINE },
+		{ 'f', 0, "log-level",				opt_log_level,					SOURCE_CMDLINE },
+		{ 's', 0, "log-filename",			&(config->log_filename),		SOURCE_CMDLINE },
+		{ 's', 0, "error-log-filename",		&(config->error_log_filename),	SOURCE_CMDLINE },
+		{ 's', 0, "log-directory",			&(config->log_directory),		SOURCE_CMDLINE },
+		{ 'u', 0, "log-rotation-size",		&(config->log_rotation_size),	SOURCE_CMDLINE },
+		{ 'u', 0, "log-rotation-age",		&(config->log_rotation_age),	SOURCE_CMDLINE },
 		/* connection options */
 		{ 's', 0, "pgdata",					&(config->pgdata),				SOURCE_FILE_STRICT },
 		{ 's', 0, "pgdatabase",				&(config->pgdatabase),			SOURCE_FILE_STRICT },

src/pg_probackup.c

@@ -135,6 +135,7 @@ static pgut_option options[] =
 	{ 'u', 37, "compress-level",		&compress_level,	SOURCE_CMDLINE },
 	{ 'b', 38, "compress",				&compress_shortcut,	SOURCE_CMDLINE },
 	/* logging options */
+	{ 'b', 'l', "log",					&log_to_file,		SOURCE_CMDLINE },
 	{ 'f', 40, "log-level",				opt_log_level,		SOURCE_CMDLINE },
 	{ 's', 41, "log-filename",			&log_filename,		SOURCE_CMDLINE },
 	{ 's', 42, "error-log-filename",	&error_log_filename, SOURCE_CMDLINE },
@@ -304,14 +305,8 @@ main(int argc, char *argv[])
 	if (pgdata != NULL && !is_absolute_path(pgdata))
 		elog(ERROR, "-D, --pgdata must be an absolute path");
 
-	/* Set log path */
-	if (log_filename || error_log_filename)
-	{
-		if (log_directory)
-			strcpy(log_path, log_directory);
-		else
-			join_path_components(log_path, backup_path, "log");
-	}
+	/* Initialize logger */
+	init_logger(backup_path);
 
 	/* Sanity check of --backup-id option */
 	if (backup_id_string_param != NULL)
@@ -430,7 +425,6 @@ static void
 opt_log_level(pgut_option *opt, const char *arg)
 {
 	log_level = parse_log_level(arg);
-	log_level_defined = true;
 }
 
 CompressAlg

src/pg_probackup.h

@@ -155,6 +155,7 @@ typedef struct pgBackupConfig
 	const char *master_user;
 	int			replica_timeout;
 
+	int			log_to_file;
 	int			log_level;
 	char	   *log_filename;
 	char	   *error_log_filename;

src/restore.c

@@ -353,7 +353,7 @@ restore_backup(pgBackup *backup)
 	parray_walk(files, pgFileFree);
 	parray_free(files);
 
-	if (log_level <= LOG)
+	if (LOG_LEVEL <= LOG)
 	{
 		char	   *backup_id;
 
@@ -396,7 +396,7 @@ remove_deleted_files(pgBackup *backup)
 		if (parray_bsearch(files, file, pgFileComparePathDesc) == NULL)
 		{
 			pgFileDelete(file);
-			if (log_level <= LOG)
+			if (LOG_LEVEL <= LOG)
 				elog(LOG, "deleted %s", GetRelativePath(file->path, pgdata));
 		}
 	}
@@ -579,7 +579,7 @@ check_tablespace_mapping(pgBackup *backup)
 	pgBackupGetPath(backup, this_backup_path, lengthof(this_backup_path), NULL);
 	read_tablespace_map(links, this_backup_path);
 
-	if (log_level <= LOG)
+	if (LOG_LEVEL <= LOG)
 	{
 		char	   *backup_id;
 

src/utils/logger.c

@@ -19,8 +19,8 @@
 
 /* Logger parameters */
 
-int			log_level = INFO;
-bool		log_level_defined = false;
+int			log_to_file = LOGGER_NONE;
+int			log_level = LOGGER_NONE;
 
 char	   *log_filename = NULL;
 char	   *error_log_filename = NULL;
@@ -68,6 +68,19 @@ static bool logging_to_file = false;
 
 static pthread_mutex_t log_file_mutex = PTHREAD_MUTEX_INITIALIZER;
 
+void
+init_logger(const char *root_path)
+{
+	/* Set log path */
+	if (LOG_TO_FILE || error_log_filename)
+	{
+		if (log_directory)
+			strcpy(log_path, log_directory);
+		else
+			join_path_components(log_path, root_path, "log");
+	}
+}
+
 static void
 write_elevel(FILE *stream, int elevel)
 {
@@ -113,9 +126,11 @@ elog_internal(int elevel, const char *fmt, va_list args)
 				write_to_stderr;
 	va_list		error_args,
 				std_args;
+	time_t		log_time = (time_t) time(NULL);
+	char		strfbuf[128];
 
 	write_to_file = log_path[0] != '\0' && !logging_to_file &&
-		(log_filename || error_log_filename);
+		(LOG_TO_FILE || error_log_filename);
 
 	/*
 	 * There is no need to lock if this is elog() from upper elog() and
@@ -138,18 +153,28 @@ elog_internal(int elevel, const char *fmt, va_list args)
 	if (write_to_stderr && write_to_file)
 		va_copy(std_args, args);
 
+	if (write_to_file)
+		strftime(strfbuf, sizeof(strfbuf), "%Y-%m-%d %H:%M:%S %Z",
+				 localtime(&log_time));
+
 	/*
 	 * Write message to log file.
 	 * Do not write to file if this error was raised during write previous
 	 * message.
 	 */
-	if (log_filename && write_to_file)
+	if (LOG_TO_FILE && write_to_file)
 	{
 		logging_to_file = true;
 
 		if (log_file == NULL)
-			open_logfile(&log_file, log_filename);
+		{
+			if (log_filename == NULL)
+				open_logfile(&log_file, "pg_probackup.log");
+			else
+				open_logfile(&log_file, log_filename);
+		}
 
+		fprintf(log_file, "%s: ", strfbuf);
 		write_elevel(log_file, elevel);
 
 		vfprintf(log_file, fmt, args);
@@ -171,6 +196,7 @@ elog_internal(int elevel, const char *fmt, va_list args)
 		if (error_log_file == NULL)
 			open_logfile(&error_log_file, error_log_filename);
 
+		fprintf(log_file, "%s: ", strfbuf);
 		write_elevel(error_log_file, elevel);
 
 		vfprintf(error_log_file, fmt, error_args);
@@ -220,7 +246,7 @@ elog(int elevel, const char *fmt, ...)
 	 * Do not log message if severity level is less than log_level.
 	 * It is the little optimisation to put it here not in elog_internal().
 	 */
-	if (elevel < log_level && elevel < ERROR)
+	if (elevel < LOG_LEVEL && elevel < ERROR)
 		return;
 
 	va_start(args, fmt);
@@ -261,7 +287,7 @@ pg_log(eLogType type, const char *fmt, ...)
 	 * Do not log message if severity level is less than log_level.
 	 * It is the little optimisation to put it here not in elog_internal().
 	 */
-	if (elevel < log_level && elevel < ERROR)
+	if (elevel < LOG_LEVEL && elevel < ERROR)
 		return;
 
 	va_start(args, fmt);

src/utils/logger.h

@@ -12,6 +12,8 @@
 
 #include "postgres_fe.h"
 
+#define LOGGER_NONE	(-10)
+
 /* Log level */
 #define VERBOSE		(-5)
 #define LOG			(-4)
@@ -24,8 +26,8 @@
 
 /* Logger parameters */
 
+extern int			log_to_file;
 extern int			log_level;
-extern bool			log_level_defined;
 
 extern char		   *log_filename;
 extern char		   *error_log_filename;
@@ -35,9 +37,14 @@ extern char			log_path[MAXPGPATH];
 extern int			log_rotation_size;
 extern int			log_rotation_age;
 
+#define LOG_TO_FILE ((log_to_file == LOGGER_NONE) ? false : (bool) log_to_file)
+#define LOG_LEVEL ((log_level == LOGGER_NONE) ? INFO : log_level)
+
 #undef elog
 extern void elog(int elevel, const char *fmt, ...) pg_attribute_printf(2, 3);
 
+extern void init_logger(const char *root_path);
+
 extern int parse_log_level(const char *level);
 extern const char *deparse_log_level(int level);
 

src/utils/pgut.c

@@ -1092,7 +1092,7 @@ pgut_execute(PGconn* conn, const char *query, int nParams, const char **params)
 		elog(ERROR, "interrupted");
 
 	/* write query to elog if verbose */
-	if (log_level <= LOG)
+	if (LOG_LEVEL <= LOG)
 	{
 		int		i;
 
@@ -1141,7 +1141,7 @@ pgut_send(PGconn* conn, const char *query, int nParams, const char **params, int
 		elog(ERROR, "interrupted");
 
 	/* write query to elog if verbose */
-	if (log_level <= LOG)
+	if (LOG_LEVEL <= LOG)
 	{
 		int		i;