microsoft
/
mysqlnd_azure
зеркало из https://github.com/microsoft/mysqlnd_azure.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

make the logOutput option exclusive, remove the ini print log in onUpdate since it will be printed out even without turn on log. Add and update log content

This commit is contained in:
Qianqian Bu 2020-07-20 13:42:35 +08:00
Родитель 700cecb457
Коммит e607eaf839
3 изменённых файлов: 66 добавлений и 60 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

50
mysqlnd_azure.c
Просмотреть файл

@ -365,6 +365,7 @@ get_redirect_info(const MYSQLND_CONN_DATA * const conn, char* redirect_host, cha
*/
AZURE_LOG(ALOG_LEVEL_DBG, "mysqlnd_azure.c: get_redirect_info()");
AZURE_LOG(ALOG_LEVEL_DBG, "last message in ok packet: %s", conn->last_message.s);
const char * msg_header = "Location: mysql://";
int msg_header_len = strlen(msg_header);
@ -477,11 +478,12 @@ MYSQLND_METHOD(mysqlnd_azure_data, connect)(MYSQLND_CONN_DATA ** pconn,
transport = conn->m->get_scheme(conn, hostname, &socket_or_pipe, port, &unix_socket, &named_pipe);
mysql_flags = conn->m->get_updated_connect_flags(conn, mysql_flags);
AZURE_LOG(ALOG_LEVEL_DBG, "mysql_flags after get_updated_connect_flags(): flags=%u", mysql_flags);
{
const MYSQLND_CSTRING scheme = { transport.s, transport.l };
if (FAIL == conn->m->connect_handshake(conn, &scheme, &username, &password, &database, mysql_flags)) {
AZURE_LOG(ALOG_LEVEL_ERR, "Connection cannot established with given information, please check the server availability, or your parameters given");
AZURE_LOG(ALOG_LEVEL_ERR, "First connect_handshake failed.");
goto err;
}
}
@ -499,16 +501,16 @@ MYSQLND_METHOD(mysqlnd_azure_data, connect)(MYSQLND_CONN_DATA ** pconn,
unsigned int ui_redirect_ttl = 0;
zend_bool serverSupportRedirect = get_redirect_info(conn, redirect_host, redirect_user, &ui_redirect_port, &ui_redirect_ttl);
if (!serverSupportRedirect) {
AZURE_LOG(ALOG_LEVEL_ERR, "Failed to get REDIRECTION information from OK Packet, please check whether your MySQL server support redirect.");
AZURE_LOG(ALOG_LEVEL_ERR, "get_redirect_info return FALSE, please check whether your MySQL server support redirection and redirection has been turned on.");
DBG_ENTER("[redirect]: Server does not support redirection.");
if(MYSQLND_AZURE_G(enableRedirect) == REDIRECT_ON) {
//REDIRECT_ON, if redirection is not supported, abort the original connection and return error
conn->m->send_close(conn);
AZURE_LOG(ALOG_LEVEL_ERR, "mysqlnd_azure.Redirection: ON, MySQL server not support REDERECTION, connection failed");
AZURE_LOG(ALOG_LEVEL_ERR, "mysqlnd_azure.enableRedirect: ON. Connection aborted because redirection is not enabled on the MySQL server or the network package doesn't meet meet redirection protocol.");
SET_CLIENT_ERROR(conn->error_info, MYSQLND_AZURE_ENFORCE_REDIRECT_ERROR_NO, UNKNOWN_SQLSTATE, "Connection aborted because redirection is not enabled on the MySQL server or the network package doesn't meet meet redirection protocol.");
goto err;
} else {
AZURE_LOG(ALOG_LEVEL_INFO, "mysqlnd_zaure.Redirection: PREFERRED, MySQL server not support REDIRECTION, conn falls back to classical one.");
AZURE_LOG(ALOG_LEVEL_INFO, "mysqlnd_zaure.enableRedirect: PREFERRED. MySQL server does not support REDIRECTION, conn falls back to classical one.");
//REDIRECT_PREFERRED, do nothing else for redirection, just use the previous connection
goto after_conn;
}
@ -520,7 +522,7 @@ MYSQLND_METHOD(mysqlnd_azure_data, connect)(MYSQLND_CONN_DATA ** pconn,
//Already use redirected connection, or the connection string is a redirected one
if (strcmp(redirect_host, hostname.s) == 0 && strcmp(redirect_user, username.s) == 0 && ui_redirect_port == port) {
DBG_ENTER("[redirect]: Is using redirection, or redirection info are equal to origin, no need to redirect");
AZURE_LOG(ALOG_LEVEL_DBG, "Given conn is already redirect_conn.");
AZURE_LOG(ALOG_LEVEL_DBG, "Is using redirection, or redirection info are equal to origin, no need to redirect.");
goto after_conn;
}
@ -535,10 +537,10 @@ MYSQLND_METHOD(mysqlnd_azure_data, connect)(MYSQLND_CONN_DATA ** pconn,
//REDIRECT_ON, abort the original connection and return error
conn->m->send_close(conn);
SET_CLIENT_ERROR(conn->error_info, MYSQLND_AZURE_ENFORCE_REDIRECT_ERROR_NO, UNKNOWN_SQLSTATE, "Connection aborted because init redirection failed.");
AZURE_LOG(ALOG_LEVEL_ERR, "mysqlnd_azure.enableRedirect: ON but redirect_connHandle init failed");
AZURE_LOG(ALOG_LEVEL_ERR, "mysqlnd_azure.enableRedirect: ON. Connection aborted because redirect_connHandle init failed.");
goto err;
} else {
AZURE_LOG(ALOG_LEVEL_INFO, "mysqlnd_azure.enableRedirect: [PREFERRED | OFF], but redirect_connHandle init failed. No redirection conn used.");
AZURE_LOG(ALOG_LEVEL_INFO, "mysqlnd_azure.enableRedirect: PREFERRED. redirect_connHandle init failed, conn falls back to classical one.");
//REDIRECT_PREFERRED, do nothing else for redirection, just use the previous connection
goto after_conn;
}
@ -551,7 +553,7 @@ MYSQLND_METHOD(mysqlnd_azure_data, connect)(MYSQLND_CONN_DATA ** pconn,
ret = set_redirect_client_options(conn, redirect_conn);
//init redirect_conn options failed, just use the proxy connection
//init redirect_conn options failed
if (ret == FAIL) {
DBG_ENTER("[redirect]: init redirection option failed. ");
redirect_conn->m->dtor(redirect_conn); //release created resource
@ -561,16 +563,19 @@ MYSQLND_METHOD(mysqlnd_azure_data, connect)(MYSQLND_CONN_DATA ** pconn,
//REDIRECT_ON, abort the original connection
conn->m->send_close(conn);
SET_CLIENT_ERROR(conn->error_info, MYSQLND_AZURE_ENFORCE_REDIRECT_ERROR_NO, UNKNOWN_SQLSTATE, "Connection aborted because init redirection failed.");
AZURE_LOG(ALOG_LEVEL_ERR, "set_redirect_client_options() failed, but mysqlnd_azure.enableRedirect: ON");
AZURE_LOG(ALOG_LEVEL_ERR, "mysqlnd_azure.enableRedirect: ON. Connection aborted because set_redirect_client_options() failed.");
goto err;
} else {
AZURE_LOG(ALOG_LEVEL_INFO, "set_redirect_client_options() failed, and mysqlnd_azure.enableRedirect: [PREFERRED | OFF], no redirect conn used.");
AZURE_LOG(ALOG_LEVEL_INFO, "mysqlnd_azure.enableRedirect: PREFERRED. set_redirect_client_options() failed, conn falls back to classical one.");
//REDIRECT_PREFERRED, do nothing else for redirection, just use the previous connection
goto after_conn;
}
}
//init redirect_conn succeeded, use this conn to start a new connection and handshake
AZURE_LOG(ALOG_LEVEL_DBG, "Redirection connection Information: redirect_host=%s redirect_user=%s redirect_port=%u flags=%u persistent=%u state=%u",
redirect_host ? redirect_host : "", redirect_user ? redirect_user : "", ui_redirect_port, mysql_flags,
redirect_conn ? redirect_conn->persistent : 0, redirect_conn ? (int)GET_CONNECTION_STATE(&redirect_conn->state) : -1);
const MYSQLND_CSTRING redirect_hostname = { redirect_host, strlen(redirect_host) };
const MYSQLND_CSTRING redirect_username = { redirect_user, strlen(redirect_user) };
@ -617,13 +622,13 @@ MYSQLND_METHOD(mysqlnd_azure_data, connect)(MYSQLND_CONN_DATA ** pconn,
}
if (MYSQLND_AZURE_G(enableRedirect) == REDIRECT_PREFERRED) {
AZURE_LOG(ALOG_LEVEL_INFO, "redirect_conn handshake failed, but mysqlnd_azure.enableRedirect: PREFERRED");
AZURE_LOG(ALOG_LEVEL_INFO, "mysqlnd_azure.enableRedirect: PREFERRED. redirect_conn handshake failed, conn falls back to classical one.");
//free object and use original connection
redirect_conn->m->dtor(redirect_conn);
goto after_conn;
} else { //REDIRECT_ON, free original connect, and use redirect_conn to handle error
AZURE_LOG(ALOG_LEVEL_ERR, "redirect_conn handshake failed, but mysqlnd_azure.enableRedirect: ON");
AZURE_LOG(ALOG_LEVEL_ERR, "mysqlnd_azure.enableRedirect: ON. redirect_conn handshake failed, connection aborted.");
conn->m->send_close(conn);
conn->m->dtor(conn);
pfc = NULL;
@ -643,7 +648,7 @@ MYSQLND_METHOD(mysqlnd_azure_data, connect)(MYSQLND_CONN_DATA ** pconn,
after_conn:
{
AZURE_LOG(ALOG_LEVEL_INFO, "Prepare the context of new connection");
AZURE_LOG(ALOG_LEVEL_INFO, "connect_handshake finished. Post conn operations like set conn objec info, init_commands");
SET_CONNECTION_STATE(&conn->state, CONN_READY);
if (saved_compression) {
@ -790,6 +795,7 @@ MYSQLND_METHOD(mysqlnd_azure, connect)(MYSQLND * conn_handle,
MYSQLND_CONN_DATA ** pconn = &conn_handle->data;
DBG_ENTER("mysqlnd_azure::connect");
AZURE_LOG(ALOG_LEVEL_INFO, "mysqlnd_azure.enableRedirect = %s", MYSQLND_AZURE_G(enableRedirect) == REDIRECT_OFF ? "off" : (MYSQLND_AZURE_G(enableRedirect) == REDIRECT_ON ? "on" : "preferred"));
if (PASS == (*pconn)->m->local_tx_start(*pconn, this_func)) {
mysqlnd_options4(conn_handle, MYSQL_OPT_CONNECT_ATTR_ADD, "_client_name", "mysqlnd");
@ -800,7 +806,6 @@ MYSQLND_METHOD(mysqlnd_azure, connect)(MYSQLND * conn_handle,
if (MYSQLND_AZURE_G(enableRedirect) == REDIRECT_OFF) {
DBG_ENTER("mysqlnd_azure::connect redirect disabled");
AZURE_LOG(ALOG_LEVEL_DBG, "mysqlnd_azure.enableRedirect: OFF");
ret = org_conn_d_m.connect(*pconn, hostname, username, password, database, port, socket_or_pipe, mysql_flags);
}
else {
@ -811,8 +816,7 @@ MYSQLND_METHOD(mysqlnd_azure, connect)(MYSQLND * conn_handle,
if (!(temp_flags & CLIENT_SSL)) {
//REDIRECT_ON, no ssl, return error
if((MYSQLND_AZURE_G(enableRedirect) == REDIRECT_ON)) {
AZURE_LOG(ALOG_LEVEL_DBG, "mysqlnd_azure.enableRedirect: ON");
AZURE_LOG(ALOG_LEVEL_ERR, "SSL not enabled when mysqlnd_azure.enableRedirect if ON");
AZURE_LOG(ALOG_LEVEL_ERR, "CLIENT_SSL is not set when mysqlnd_azure.enableRedirect is ON");
SET_CLIENT_ERROR((*pconn)->error_info, MYSQLND_AZURE_ENFORCE_REDIRECT_ERROR_NO, UNKNOWN_SQLSTATE, "mysqlnd_azure.enableRedirect is on, but SSL option is not set in connection string. Redirection is only possible with SSL.");
(*pconn)->m->local_tx_end(*pconn, this_func, FAIL);
(*pconn)->m->free_contents(*pconn);
@ -820,8 +824,7 @@ MYSQLND_METHOD(mysqlnd_azure, connect)(MYSQLND * conn_handle,
DBG_RETURN(FAIL);
}
else { //REDIRECT_PREFERRED, no ssl, do not redirect
AZURE_LOG(ALOG_LEVEL_DBG, "mysqlnd_azure.enableRedirect: PREFERRED");
AZURE_LOG(ALOG_LEVEL_INFO, "SSL not enabled, and mysqlnd_zaure.enableRedirect if PREFERRED, connection will go through gateway.");
AZURE_LOG(ALOG_LEVEL_INFO, "CLIENT_SSL is not set and mysqlnd_zaure.enableRedirect is PREFERRED, connection will go through gateway.");
ret = org_conn_d_m.connect(*pconn, hostname, username, password, database, port, socket_or_pipe, mysql_flags);
}
}
@ -831,17 +834,23 @@ MYSQLND_METHOD(mysqlnd_azure, connect)(MYSQLND * conn_handle,
MYSQLND_AZURE_REDIRECT_INFO* redirect_info = mysqlnd_azure_find_redirect_cache(username.s, hostname.s, port);
if (redirect_info != NULL) {
DBG_ENTER("mysqlnd_azure::connect try the cached info first");
AZURE_LOG(ALOG_LEVEL_INFO, "Find cache. mysqlnd_azure::connect try the cached info first");
AZURE_LOG(ALOG_LEVEL_DBG, "cached host : %s, cached user : %s, cached port : %u", redirect_info->redirect_host, redirect_info->redirect_user, redirect_info->redirect_port);
const MYSQLND_CSTRING redirect_host = { redirect_info->redirect_host, strlen(redirect_info->redirect_host) };
const MYSQLND_CSTRING redirect_user = { redirect_info->redirect_user, strlen(redirect_info->redirect_user) };
ret = (*pconn)->m->connect(pconn, redirect_host, redirect_user, password, database, redirect_info->redirect_port, socket_or_pipe, mysql_flags);
if (ret == FAIL) {
AZURE_LOG(ALOG_LEVEL_INFO, "Redirect cache miss");
AZURE_LOG(ALOG_LEVEL_INFO, "Use cache failed.");
//remove invalid cache
mysqlnd_azure_remove_redirect_cache(username.s, hostname.s, port);
ret = (*pconn)->m->connect(pconn, hostname, username, password, database, port, socket_or_pipe, mysql_flags);
}
else {
AZURE_LOG(ALOG_LEVEL_INFO, "Use cache sccuceeded.");
}
}
else {
AZURE_LOG(ALOG_LEVEL_INFO, "No cache found");
@ -870,7 +879,8 @@ int mysqlnd_azure_apply_resources() {
if (ZSTR_LEN(MYSQLND_AZURE_G(logfilePath)) > 155) {
logflag = 1;
logfilePath = "mysqlnd_azure_runtime.log";
} else {
}
else {
logfilePath = ZSTR_VAL(MYSQLND_AZURE_G(logfilePath));
}

6
php_mysqlnd_azure.c
Просмотреть файл

@ -60,10 +60,6 @@ static ZEND_INI_MH(OnUpdateEnableLogfile) {
}
static ZEND_INI_MH(OnUpdateEnableLogLevel) {
// Loglevel is a PHP_INI_ALL variable,
// every time it changed will be logged (unless it is 0 now)
AZURE_LOG_SYS("mysqlnd_azure.logLevel changed: %d -> %d",
MYSQLND_AZURE_G(logLevel), atoi(ZSTR_VAL(new_value)));
if (STRING_EQUALS(new_value, "3")) {
MYSQLND_AZURE_G(logLevel) = 3;
@ -79,7 +75,7 @@ static ZEND_INI_MH(OnUpdateEnableLogLevel) {
static ZEND_INI_MH(OnUpdateEnableLogOutput) {
int tval = atoi(ZSTR_VAL(new_value));
if (tval > 0 && tval < 8) {
if (tval == ALOG_TYPE_PHPERROR || tval == ALOG_TYPE_FILE || tval == ALOG_TYPE_STDERR) {
MYSQLND_AZURE_G(logOutput) = tval;
} else {
MYSQLND_AZURE_G(logOutput) = 0;

12
utils.h
Просмотреть файл

@ -45,12 +45,12 @@ extern FILE *logfile;
php_error_docref(NULL, E_WARNING, "[%s] [MYSQLND_AZURE] [%s] " format, \
timestr, levelstr, ## __VA_ARGS__); \
} \
if ((MYSQLND_AZURE_G(logOutput) & ALOG_TYPE_FILE) && logfile) { \
fprintf(logfile, "[%s] [%s] " format "\n", timestr, levelstr, \
else if ((MYSQLND_AZURE_G(logOutput) & ALOG_TYPE_FILE) && logfile) { \
fprintf(logfile, "[%s] [MYSQLND_AZURE] [%s] " format "\n", timestr, levelstr, \
## __VA_ARGS__); \
fflush(logfile); \
} \
if (MYSQLND_AZURE_G(logOutput) & ALOG_TYPE_STDERR) { \
else if (MYSQLND_AZURE_G(logOutput) & ALOG_TYPE_STDERR) { \
fprintf(stderr, "[%s] [MYSQLND_AZURE] [%s] " format "\n", timestr, levelstr, \
## __VA_ARGS__); \
fflush(stderr); \
@ -68,12 +68,12 @@ extern FILE *logfile;
php_error_docref(NULL, E_WARNING, "[%s] [MYSQLND_AZURE] [SYSTM] " format "%s", \
timestr, ## __VA_ARGS__, PHP_EOL); \
} \
if ((MYSQLND_AZURE_G(logOutput) & ALOG_TYPE_FILE) && logfile) { \
fprintf(logfile, "[%s] [SYSTM] " format "\n", timestr, \
else if ((MYSQLND_AZURE_G(logOutput) & ALOG_TYPE_FILE) && logfile) { \
fprintf(logfile, "[%s] [MYSQLND_AZURE] [SYSTM] " format "\n", timestr, \
## __VA_ARGS__); \
fflush(logfile); \
} \
if (MYSQLND_AZURE_G(logOutput) & ALOG_TYPE_STDERR) { \
else if (MYSQLND_AZURE_G(logOutput) & ALOG_TYPE_STDERR) { \
fprintf(stderr, "[%s] [MYSQLND_AZURE] [SYSTM] " format "\n", timestr, \
## __VA_ARGS__); \
fflush(stderr); \