database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-5681 audit log will not rotate when the file size exceeds global variable setting.

Browse Source 
Notifications about changed variables:
              server_audit_file_rotate_now
              server_audit_file_rotations
              server_audit_file_rotations
   are now handled and one doesn't need to stop/start logging to make them effective.
This commit is contained in:
Alexey Botchkov
2014-03-17 19:09:53 +04:00
parent dd13db6f4a
commit 3f8c76f9e5
1 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
plugin/server_audit/server_audit.c
View File

@@ -172,6 +172,10 @@ static char default_file_name[DEFAULT_FILENAME_LEN+1]= "server_audit.log";
static void update_file_path(MYSQL_THD thd, struct st_mysql_sys_var *var, static void update_file_path(MYSQL_THD thd, struct st_mysql_sys_var *var,
void *var_ptr, const void *save); void *var_ptr, const void *save);
static void update_file_rotate_size(MYSQL_THD thd, struct st_mysql_sys_var *var,
void *var_ptr, const void *save);
static void update_file_rotations(MYSQL_THD thd, struct st_mysql_sys_var *var,
void *var_ptr, const void *save);
static void update_incl_users(MYSQL_THD thd, struct st_mysql_sys_var *var, static void update_incl_users(MYSQL_THD thd, struct st_mysql_sys_var *var,
void *var_ptr, const void *save); void *var_ptr, const void *save);
static void update_excl_users(MYSQL_THD thd, struct st_mysql_sys_var *var, static void update_excl_users(MYSQL_THD thd, struct st_mysql_sys_var *var,
@@ -230,11 +234,11 @@ static MYSQL_SYSVAR_STR(file_path, file_path, PLUGIN_VAR_RQCMDARG,
"Path to the log file.", NULL, update_file_path, default_file_name); "Path to the log file.", NULL, update_file_path, default_file_name);
static MYSQL_SYSVAR_ULONGLONG(file_rotate_size, file_rotate_size, static MYSQL_SYSVAR_ULONGLONG(file_rotate_size, file_rotate_size,
PLUGIN_VAR_RQCMDARG, "Maximum size of the log to start the rotation.", PLUGIN_VAR_RQCMDARG, "Maximum size of the log to start the rotation.",
NULL, NULL, NULL, update_file_rotate_size,
1000000, 100, ((long long) 0x7FFFFFFFFFFFFFFFLL), 1); 1000000, 100, ((long long) 0x7FFFFFFFFFFFFFFFLL), 1);
static MYSQL_SYSVAR_UINT(file_rotations, rotations, static MYSQL_SYSVAR_UINT(file_rotations, rotations,
PLUGIN_VAR_RQCMDARG, "Number of rotations before log is removed.", PLUGIN_VAR_RQCMDARG, "Number of rotations before log is removed.",
NULL, NULL, 9, 0, 999, 1); NULL, update_file_rotations, 9, 0, 999, 1);
static MYSQL_SYSVAR_BOOL(file_rotate_now, rotate, PLUGIN_VAR_OPCMDARG, static MYSQL_SYSVAR_BOOL(file_rotate_now, rotate, PLUGIN_VAR_OPCMDARG,
"Force log rotation now.", NULL, rotate_log, FALSE); "Force log rotation now.", NULL, rotate_log, FALSE);
static MYSQL_SYSVAR_BOOL(logging, logging, static MYSQL_SYSVAR_BOOL(logging, logging,
@@ -1332,6 +1336,7 @@ exit_func:
switch (after_action) { switch (after_action) {
case AA_FREE_CONNECTION: case AA_FREE_CONNECTION:
my_hash_delete(&connection_hash, (uchar *) cn); my_hash_delete(&connection_hash, (uchar *) cn);
cn= 0;
break; break;
case AA_CHANGE_USER: case AA_CHANGE_USER:
{ {
@@ -1680,6 +1685,41 @@ exit_func:
} }
static void update_file_rotations(MYSQL_THD thd __attribute__((unused)),
struct st_mysql_sys_var *var __attribute__((unused)),
void *var_ptr __attribute__((unused)), const void *save)
{
rotations= *(unsigned int *) save;
error_header();
fprintf(stderr, "Log file rotations was changed to '%d'.\n", rotations);
if (!logging || output_type != OUTPUT_FILE)
return;
flogger_mutex_lock(&lock_operations);
logfile->rotations= rotations;
flogger_mutex_unlock(&lock_operations);
}
static void update_file_rotate_size(MYSQL_THD thd __attribute__((unused)),
struct st_mysql_sys_var *var __attribute__((unused)),
void *var_ptr __attribute__((unused)), const void *save)
{
file_rotate_size= *(unsigned long long *) save;
error_header();
fprintf(stderr, "Log file rotate size was changed to '%lld'.\n",
file_rotate_size);
if (!logging || output_type != OUTPUT_FILE)
return;
flogger_mutex_lock(&lock_operations);
logfile->size_limit= file_rotate_size;
flogger_mutex_unlock(&lock_operations);
}
static void update_incl_users(MYSQL_THD thd, static void update_incl_users(MYSQL_THD thd,
struct st_mysql_sys_var *var __attribute__((unused)), struct st_mysql_sys_var *var __attribute__((unused)),
void *var_ptr __attribute__((unused)), const void *save) void *var_ptr __attribute__((unused)), const void *save)
@@ -1821,6 +1861,7 @@ static void update_mode(MYSQL_THD thd __attribute__((unused)),
flogger_mutex_unlock(&lock_operations); flogger_mutex_unlock(&lock_operations);
} }
static void update_syslog_ident(MYSQL_THD thd __attribute__((unused)), static void update_syslog_ident(MYSQL_THD thd __attribute__((unused)),
struct st_mysql_sys_var *var __attribute__((unused)), struct st_mysql_sys_var *var __attribute__((unused)),
void *var_ptr __attribute__((unused)), const void *save) void *var_ptr __attribute__((unused)), const void *save)
@@ -1828,8 +1869,15 @@ static void update_syslog_ident(MYSQL_THD thd __attribute__((unused)),
strncpy(syslog_ident_buffer, *(const char **) save, strncpy(syslog_ident_buffer, *(const char **) save,
sizeof(syslog_ident_buffer)); sizeof(syslog_ident_buffer));
syslog_ident= syslog_ident_buffer; syslog_ident= syslog_ident_buffer;
error_header();
fprintf(stderr, "SYSYLOG ident was changed to '%s'\n", syslog_ident);
flogger_mutex_lock(&lock_operations); flogger_mutex_lock(&lock_operations);
mark_always_logged(thd); mark_always_logged(thd);
if (logging && output_type == OUTPUT_SYSLOG)
{
stop_logging();
start_logging();
}
flogger_mutex_unlock(&lock_operations); flogger_mutex_unlock(&lock_operations);
} }