Disable logging to file in agent

knizhnik · knizhnik · commit 03056c7238c4 · 2019-01-22T14:40:49.000+03:00
diff --git a/src/utils/file.c b/src/utils/file.c
@@ -268,15 +268,23 @@ FILE* fio_fopen(char const* path, char const* mode, fio_location location)
 	FILE* f;
 	if (fio_is_remote(location))
 	{
-		int flags = O_RDWR|O_CREAT|PG_BINARY|(strchr(mode, '+') ? 0 : O_TRUNC);
-		int fd = fio_open(path, flags, location);
+		int flags = O_RDWR|O_CREAT;
+		int fd;
+		if (strcmp(mode, PG_BINARY_W) == 0) {
+			flags |= O_TRUNC|PG_BINARY;
+		} else if (strncmp(mode, PG_BINARY_R, strlen(PG_BINARY_R)) == 0) {
+			flags |= PG_BINARY;
+		} else if (strcmp(mode, "a") == 0) {
+			flags |= O_APPEND;
+		}
+		fd = fio_open(path, flags, location);
 		f = (FILE*)(size_t)((fd + 1) & ~FIO_PIPE_MARKER);
 	}
 	else
 	{
 		f = fopen(path, mode);
 		if (f == NULL && strcmp(mode, PG_BINARY_R "+") == 0)
-			f = fopen(path,  PG_BINARY_W);
+			f = fopen(path, PG_BINARY_W);
 	}
 	return f;
 }
diff --git a/src/utils/logger.c b/src/utils/logger.c
@@ -157,8 +157,10 @@ elog_internal(int elevel, bool file_only, const char *message)
 	time_t		log_time = (time_t) time(NULL);
 	char		strfbuf[128];
 
-	write_to_file = elevel >= logger_config.log_level_file &&
-		logger_config.log_directory && logger_config.log_directory[0] != '\0';
+	write_to_file = elevel >= logger_config.log_level_file
+		&& logger_config.log_directory
+		&& logger_config.log_directory[0] != '\0'
+		&& !remote_agent;
 	write_to_error_log = elevel >= ERROR && logger_config.error_log_filename &&
 		logger_config.log_directory && logger_config.log_directory[0] != '\0';
 	write_to_stderr = elevel >= (remote_agent ? ERROR : logger_config.log_level_console) && !file_only;

Original file line number	Diff line number	Diff line change
`@@ -268,15 +268,23 @@ FILE* fio_fopen(char const* path, char const* mode, fio_location location)`
`268`	`268`	`FILE* f;`
`269`	`269`	`if (fio_is_remote(location))`
`270`	`270`	`{`
`271`		`- int flags = O_RDWR\|O_CREAT\|PG_BINARY\|(strchr(mode, '+') ? 0 : O_TRUNC);`
`272`		`- int fd = fio_open(path, flags, location);`
	`271`	`+ int flags = O_RDWR\|O_CREAT;`
	`272`	`+ int fd;`
	`273`	`+ if (strcmp(mode, PG_BINARY_W) == 0) {`
	`274`	`+ flags \|= O_TRUNC\|PG_BINARY;`
	`275`	`+ } else if (strncmp(mode, PG_BINARY_R, strlen(PG_BINARY_R)) == 0) {`
	`276`	`+ flags \|= PG_BINARY;`
	`277`	`+ } else if (strcmp(mode, "a") == 0) {`
	`278`	`+ flags \|= O_APPEND;`
	`279`	`+ }`
	`280`	`+ fd = fio_open(path, flags, location);`
`273`	`281`	`f = (FILE*)(size_t)((fd + 1) & ~FIO_PIPE_MARKER);`
`274`	`282`	`}`
`275`	`283`	`else`
`276`	`284`	`{`
`277`	`285`	`f = fopen(path, mode);`
`278`	`286`	`if (f == NULL && strcmp(mode, PG_BINARY_R "+") == 0)`
`279`		`- f = fopen(path, PG_BINARY_W);`
	`287`	`+ f = fopen(path, PG_BINARY_W);`
`280`	`288`	`}`
`281`	`289`	`return f;`
`282`	`290`	`}`