mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Polishing:
- change some return types from int to bool; - add [ERROR] tag to log_error() output; - add [INFO] tag to log_info() output; - change log messages to be more consistent. server-tools/instance-manager/IMService.cpp: Log polishing. server-tools/instance-manager/commands.cc: Log polishing. server-tools/instance-manager/commands.h: Eliminate warnings. server-tools/instance-manager/instance.cc: Log polishing. server-tools/instance-manager/instance_map.cc: Log polishing. server-tools/instance-manager/instance_options.cc: 1) Log polishing. 2) Change int-return type to bool. server-tools/instance-manager/instance_options.h: Change int-return type to bool. server-tools/instance-manager/listener.cc: Log polishing. server-tools/instance-manager/log.cc: Log polishing. server-tools/instance-manager/log.h: Log polishing. server-tools/instance-manager/manager.cc: Log polishing. server-tools/instance-manager/mysql_connection.cc: Log polishing. server-tools/instance-manager/mysql_connection.h: Change int-return type to bool. server-tools/instance-manager/mysqlmanager.cc: Log polishing. server-tools/instance-manager/priv.cc: Log polishing. server-tools/instance-manager/thread_registry.cc: 1. Print pthread_t as (unsigned long), not as (signed long) to avoid negative identifiers in output. 2. Print thread id after it will be initialized, not before. server-tools/instance-manager/user_map.cc: Log polishing.
This commit is contained in:
@ -41,7 +41,7 @@ int User::init(const char *line)
|
||||
name_end= strchr(name_begin, line[0]);
|
||||
if (name_end == 0 || name_end[1] != ':')
|
||||
{
|
||||
log_info("Error: invalid format (unmatched quote) of user line (%s).",
|
||||
log_error("Invalid format (unmatched quote) of user line (%s).",
|
||||
(const char *) line);
|
||||
return 1;
|
||||
}
|
||||
@ -53,7 +53,7 @@ int User::init(const char *line)
|
||||
name_end= strchr(name_begin, ':');
|
||||
if (name_end == 0)
|
||||
{
|
||||
log_info("Error: invalid format (no delimiter) of user line (%s).",
|
||||
log_error("Invalid format (no delimiter) of user line (%s).",
|
||||
(const char *) line);
|
||||
return 1;
|
||||
}
|
||||
@ -63,7 +63,7 @@ int User::init(const char *line)
|
||||
user_length= name_end - name_begin;
|
||||
if (user_length > USERNAME_LENGTH)
|
||||
{
|
||||
log_info("Error: user name is too long (%d). Max length: %d. "
|
||||
log_error("User name is too long (%d). Max length: %d. "
|
||||
"User line: '%s'.",
|
||||
(int) user_length,
|
||||
(int) USERNAME_LENGTH,
|
||||
@ -74,7 +74,7 @@ int User::init(const char *line)
|
||||
password_length= strlen(password);
|
||||
if (password_length > SCRAMBLED_PASSWORD_CHAR_LENGTH)
|
||||
{
|
||||
log_info("Error: password is too long (%d). Max length: %d."
|
||||
log_error("Password is too long (%d). Max length: %d."
|
||||
"User line: '%s'.",
|
||||
(int) password_length,
|
||||
(int) SCRAMBLED_PASSWORD_CHAR_LENGTH,
|
||||
@ -90,7 +90,7 @@ int User::init(const char *line)
|
||||
|
||||
get_salt_from_password(salt, password);
|
||||
|
||||
log_info("loaded user '%s'.", user);
|
||||
log_info("Loaded user '%s'.", (const char *) user);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -214,7 +214,7 @@ int User_map::load(const char *password_file_name, const char **err_msg)
|
||||
return ERR_IO_ERROR;
|
||||
}
|
||||
|
||||
log_info("loading the password database...");
|
||||
log_info("Loading the password database...");
|
||||
|
||||
while (fgets(line, sizeof(line), file))
|
||||
{
|
||||
@ -292,7 +292,7 @@ int User_map::load(const char *password_file_name, const char **err_msg)
|
||||
}
|
||||
}
|
||||
|
||||
log_info("the password database loaded successfully.");
|
||||
log_info("The password database loaded successfully.");
|
||||
|
||||
my_fclose(file, MYF(0));
|
||||
|
||||
|
Reference in New Issue
Block a user