Commit4ceee57

committed

Some fixes for remote logging

1 parentfce117d commit4ceee57Copy full SHA for 4ceee57

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`#include<sys/stat.h>`
`13`	`13`
	`14`	`+#include"pg_probackup.h"`
`14`	`15`	`#include"logger.h"`
`15`	`16`	`#include"pgut.h"`
`16`	`17`	`#include"thread.h"`
`@@ -160,7 +161,7 @@ elog_internal(int elevel, bool file_only, const char *message)`
`160`	`161`	`logger_config.log_directory&&logger_config.log_directory[0]!='\0';`
`161`	`162`	`write_to_error_log=elevel >=ERROR&&logger_config.error_log_filename&&`
`162`	`163`	`logger_config.log_directory&&logger_config.log_directory[0]!='\0';`
`163`		`-write_to_stderr=elevel >=logger_config.log_level_console&& !file_only;`
	`164`	`+write_to_stderr=elevel >=(remote_agent ?ERROR :logger_config.log_level_console)&& !file_only;`
`164`	`165`
`165`	`166`	`pthread_lock(&log_file_mutex);`
`166`	`167`	`loggin_in_progress= true;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ int remote_execute(int argc, char* argv[], bool listen)`
`155`	`155`	`intoffs,rc;`
`156`	`156`	`for (offs=0; (rc=read(errfd[0],&buf[offs],sizeof(buf)-offs))>0;offs+=rc);`
`157`	`157`	`buf[offs]='\0';`
`158`		`-elog(ERROR,buf);`
	`158`	`+elog(ERROR,"%s",strncmp(buf,"ERROR: ",6)==0 ?buf+6 :buf);`
`159`	`159`	`}`
`160`	`160`	`returnstatus;`
`161`	`161`	`}else {`

Comments

(0)