hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2019-01-24 14:41:03 +01:00
commit e3e5b39a62
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/util.cpp
View file

@ -247,7 +247,8 @@ namespace Util{
/// Parses log messages from the given file descriptor in, printing them to out, optionally calling the given callback for each valid message.
/// Closes the file descriptor on read error
void logParser(int in, int out, bool colored, void callback(std::string, std::string, bool)){
void logParser(int in, int out, bool colored, void callback(const std::string &, const std::string &, const std::string &, bool)){
char buf[1024];
FILE *output = fdopen(in, "r");
char *color_time, *color_msg, *color_end, *color_strm, *CONF_msg, *FAIL_msg, *ERROR_msg, *WARN_msg, *INFO_msg;
@ -327,7 +328,7 @@ namespace Util{
buf[j] = 0;
//print message
if (message){
if (callback){callback(kind, message, true);}
if (callback){callback(kind, message, strmNm, true);}
color_msg = color_end;
if (colored){
if (!strcmp(kind, "CONF")){color_msg = CONF_msg;}

2
lib/util.h
View file

@ -39,7 +39,7 @@ namespace Util{
};
void logParser(int in, int out, bool colored, void callback(std::string, std::string, bool) = 0);
void logParser(int in, int out, bool colored, void callback(const std::string &, const std::string &, const std::string &, bool) = 0);
void redirectLogsIfNeeded();
/// Holds type, size and offset for RelAccX class internal data fields.