Merge branch 'master' into develop

This commit is contained in:
Markus Makela
2015-07-16 05:40:20 +03:00

View File

@ -81,6 +81,9 @@ ssize_t log_ses_count[LOGFILE_LAST] = {0};
*/
#define MAX_LOGSTRLEN BUFSIZ
/** Use the skygw_ prefix, only for 1.1 compatible builds*/
#define OLD_LOGNAMES
/**
* Path to directory in which all files are stored to shared memory
* by the OS.
@ -309,7 +312,7 @@ const char* get_suffix_default(void)
const char* get_debug_prefix_default(void)
{
return "debug";
return "debug";
}
const char* get_debug_suffix_default(void)
@ -319,7 +322,7 @@ const char* get_debug_suffix_default(void)
const char* get_trace_prefix_default(void)
{
return "trace";
return "trace";
}
const char* get_trace_suffix_default(void)
@ -329,7 +332,7 @@ const char* get_trace_suffix_default(void)
const char* get_msg_prefix_default(void)
{
return "messages";
return "messages";
}
const char* get_msg_suffix_default(void)
@ -339,7 +342,7 @@ const char* get_msg_suffix_default(void)
const char* get_err_prefix_default(void)
{
return "error";
return "error";
}
const char* get_err_suffix_default(void)
@ -349,7 +352,7 @@ const char* get_err_suffix_default(void)
const char* get_logpath_default(void)
{
return "/tmp";
return "/var/log/maxscale";
}
static bool logmanager_init_nomutex(