diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c
index 83afc34..c80c8d8 100644
--- a/src/backend/postmaster/syslogger.c
+++ b/src/backend/postmaster/syslogger.c
@@ -1397,12 +1397,8 @@ logfile_writename(char *filename, char *csvfilename)
 {
 	FILE	*fh;
 	char	tempfn[MAXPGPATH];
-	char	logpathfilename[MAXPGPATH];
 
-	snprintf(tempfn, sizeof(tempfn), "%s",
-						CURRENT_LOG_FILENAME);
-	strcat(tempfn, ".tmp");
-	snprintf(logpathfilename, sizeof(logpathfilename), "%s",
+	snprintf(tempfn, sizeof(tempfn), "%s.tmp",
 						CURRENT_LOG_FILENAME);
 	if ((fh = logfile_open(tempfn, "w", true) ) == NULL)
 	{
@@ -1413,7 +1409,7 @@ logfile_writename(char *filename, char *csvfilename)
 		{
 			ereport(LOG,
 					(errcode_for_file_access(),
-					errmsg("could not write log file \"%s\": %m",
+					errmsg("could not write stderr log file path \"%s\": %m",
 						tempfn)));
 			fclose(fh);
 			return;
@@ -1425,7 +1421,7 @@ logfile_writename(char *filename, char *csvfilename)
 		{
 			ereport(LOG,
 					(errcode_for_file_access(),
-					errmsg("could not write log file \"%s\": %m",
+					errmsg("could not write csvlog log file path \"%s\": %m",
 						tempfn)));
 			fclose(fh);
 			return;
@@ -1433,7 +1429,7 @@ logfile_writename(char *filename, char *csvfilename)
 	}
 	fclose(fh);
 
-	if (rename(tempfn, logpathfilename) != 0)
+	if (rename(tempfn, CURRENT_LOG_FILENAME) != 0)
 	{
 		ereport(LOG,
 				(errcode_for_file_access(),