maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-623: Clean up logging (libwebsockets adds newline characters).

Browse Source
This commit is contained in:
Michael Jumper 2018-09-11 03:17:00 -07:00
parent 83a531bc89
commit 61df2956b3
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/protocols/kubernetes/client.c
View File

@ -48,9 +48,32 @@ guac_client* guac_kubernetes_lws_current_client = NULL;
* The line of logging output to log. * The line of logging output to log.
*/ */
static void guac_kubernetes_log(int level, const char* line) { static void guac_kubernetes_log(int level, const char* line) {
if (guac_kubernetes_lws_current_client != NULL)
guac_client_log(guac_kubernetes_lws_current_client, GUAC_LOG_DEBUG, char buffer[1024];
"libwebsockets: %s", line);
/* Drop log message if there's nowhere to log yet */
if (guac_kubernetes_lws_current_client == NULL)
return;
/* Trim length of line to fit buffer (plus null terminator) */
int length = strlen(line);
if (length > sizeof(buffer) - 1)
length = sizeof(buffer) - 1;
/* Copy as much of the received line as will fit in the buffer */
memcpy(buffer, line, length);
/* If the line ends with a newline character, trim the character */
if (length > 0 && buffer[length - 1] == '\n')
length--;
/* Null-terminate the trimmed string */
buffer[length] = '\0';
/* Log using guacd's own log facilities */
guac_client_log(guac_kubernetes_lws_current_client, GUAC_LOG_DEBUG,
"libwebsockets: %s", buffer);
} }
int guac_client_init(guac_client* client) { int guac_client_init(guac_client* client) {