hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into schemarouter_refresh

Browse Source
This commit is contained in:
Markus Makela
2015-06-11 18:47:37 +03:00
parent 2658a437eb 7aa154deb4
commit eb8ec650ae
2 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
server/core/gateway.c
View File

@ -935,7 +935,7 @@ int main(int argc, char **argv)
char* tmp_var; char* tmp_var;
int option_index; int option_index;
int logtofile = 0; /* Use shared memory or file */ int logtofile = 0; /* Use shared memory or file */
int syslog_enabled = 1; /** Log to syslog */ int syslog_enabled = 0; /** Log to syslog */
int maxscalelog_enabled = 1; /** Log with MaxScale */ int maxscalelog_enabled = 1; /** Log with MaxScale */
ssize_t log_flush_timeout_ms = 0; ssize_t log_flush_timeout_ms = 0;
sigset_t sigset; sigset_t sigset;
@ -1078,26 +1078,34 @@ int main(int argc, char **argv)
} }
break; break;
case 'S': case 'S':
if(strstr(optarg,"=")) {
{ char* tok = strstr(optarg,"=");
strtok(optarg,"= "); if(tok)
maxscalelog_enabled = config_truth_value(strtok(NULL,"= ")); {
} tok++;
else if(tok)
{ maxscalelog_enabled = config_truth_value(tok);
maxscalelog_enabled = config_truth_value(optarg); }
} else
{
maxscalelog_enabled = config_truth_value(optarg);
}
}
break; break;
case 's': case 's':
if(strstr(optarg,"=")) {
{ char* tok = strstr(optarg,"=");
strtok(optarg,"= "); if(tok)
syslog_enabled = config_truth_value(strtok(NULL,"= ")); {
} tok++;
else if(tok)
{ syslog_enabled = config_truth_value(tok);
syslog_enabled = config_truth_value(optarg); }
} else
{
syslog_enabled = config_truth_value(optarg);
}
}
break; break;
case 'U': case 'U':
if(set_user(optarg) != 0) if(set_user(optarg) != 0)

4
server/modules/filter/qlafilter.c
View File

@ -305,7 +305,9 @@ char *remote, *userName;
sprintf(my_session->filename, "%s.%d", sprintf(my_session->filename, "%s.%d",
my_instance->filebase, my_instance->filebase,
my_instance->sessions); my_instance->sessions);
atomic_add(&my_instance->sessions,1);
// Multiple sessions can try to update my_instance->sessions simultaneously
atomic_add(&(my_instance->sessions), 1);
if (my_session->active) if (my_session->active)
{ {