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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä
2020-08-28 14:24:16 +03:00
parent bce427f4ad 63a050bd7a
commit caedf79464
5 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/core/dcb.cc
View File

@ -3256,7 +3256,16 @@ json_t* dcb_to_json(DCB* dcb)
char buf[25];
snprintf(buf, sizeof(buf), "%p", dcb);
json_object_set_new(obj, "id", json_string(buf));
json_object_set_new(obj, "server", json_string(dcb->server->name()));
if (dcb->server)
{
json_object_set_new(obj, "server", json_string(dcb->server->name()));
}
if (dcb->ssl)
{
json_object_set_new(obj, "cipher", json_string(SSL_get_cipher_name(dcb->ssl)));
}
if (dcb->func.diagnostics_json)
{