Commit85b247d

committed

Fix problem with logging filtering

1 parent516cfa3 commit85b247dCopy full SHA for 85b247d

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -159,12 +159,16 @@ elog_internal(int elevel, bool file_only, const char *message)`
`159`	`159`
`160`	`160`	`write_to_file=elevel >=logger_config.log_level_file`
`161`	`161`	`&&logger_config.log_directory`
`162`		`-&&logger_config.log_directory[0]!='\0'`
`163`		`-&& !remote_agent;`
	`162`	`+&&logger_config.log_directory[0]!='\0';`
`164`	`163`	`write_to_error_log=elevel >=ERROR&&logger_config.error_log_filename&&`
`165`		`-logger_config.log_directory&&logger_config.log_directory[0]!='\0'&& !remote_agent;`
`166`		`-write_to_stderr=(elevel >=(remote_agent ?ERROR :logger_config.log_level_console)&& !file_only)\|\|remote_agent;`
	`164`	`+logger_config.log_directory&&logger_config.log_directory[0]!='\0';`
	`165`	`+write_to_stderr=elevel >=logger_config.log_level_console&& !file_only;`
`167`	`166`
	`167`	`+if (remote_agent)`
	`168`	`+{`
	`169`	`+write_to_stderr \|=write_to_error_log \|write_to_file;`
	`170`	`+write_to_error_log=write_to_file= false;`
	`171`	`+}`
`168`	`172`	`pthread_lock(&log_file_mutex);`
`169`	`173`	`loggin_in_progress= true;`
`170`	`174`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,8 @@ static void* error_reader_proc(void* arg)`
`97`	`97`	`elog(ERROR,"%s",buf+7);`
`98`	`98`	`}if (strncmp(buf,"WARNING: ",9)==0) {`
`99`	`99`	`elog(WARNING,"%s",buf+9);`
	`100`	`+}if (strncmp(buf,"VERBOSE: ",9)==0) {`
	`101`	`+elog(VERBOSE,"%s",buf+9);`
`100`	`102`	`}elseif (strncmp(buf,"LOG: ",5)==0) {`
`101`	`103`	`elog(LOG,"%s",buf+5);`
`102`	`104`	`}elseif (strncmp(buf,"INFO: ",6)==0) {`

Comments

(0)