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:
@ -54,24 +54,24 @@ int HandleServiceOptions()
|
||||
if (Options::Service::install_as_service)
|
||||
{
|
||||
if (winService.IsInstalled())
|
||||
log_info("Service is already installed");
|
||||
log_info("Service is already installed.");
|
||||
else if (winService.Install())
|
||||
log_info("Service installed successfully");
|
||||
log_info("Service installed successfully.");
|
||||
else
|
||||
{
|
||||
log_info("Service failed to install");
|
||||
log_error("Service failed to install.");
|
||||
ret_val= 1;
|
||||
}
|
||||
}
|
||||
else if (Options::Service::remove_service)
|
||||
{
|
||||
if (! winService.IsInstalled())
|
||||
log_info("Service is not installed");
|
||||
log_info("Service is not installed.");
|
||||
else if (winService.Remove())
|
||||
log_info("Service removed successfully");
|
||||
log_info("Service removed successfully.");
|
||||
else
|
||||
{
|
||||
log_info("Service failed to remove");
|
||||
log_error("Service failed to remove.");
|
||||
ret_val= 1;
|
||||
}
|
||||
}
|
||||
@ -81,7 +81,7 @@ int HandleServiceOptions()
|
||||
|
||||
if (!winService.Init())
|
||||
{
|
||||
log_info("Service failed to initialize.");
|
||||
log_error("Service failed to initialize.");
|
||||
fprintf(stderr,
|
||||
"The service should be started by Windows Service Manager.\n"
|
||||
"The MySQL Manager should be started with '--standalone'\n"
|
||||
|
Reference in New Issue
Block a user