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

Added logging to client threads

Browse Source
This commit is contained in:
Michael Jumper 2011-11-24 18:51:05 -08:00
parent 66a0ff52ee
commit 0a39a5d63d
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
guacd/src/client.c
View File

@ -40,6 +40,7 @@
#include <guacamole/guacio.h> #include <guacamole/guacio.h>
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/log.h> #include <guacamole/log.h>
#include <guacamole/error.h>
#include "client.h" #include "client.h"
#include "thread.h" #include "thread.h"
@ -61,14 +62,24 @@ void* __guac_client_output_thread(void* data) {
/* Occasionally ping client with repeat of last sync */ /* Occasionally ping client with repeat of last sync */
guac_timestamp timestamp = guac_current_timestamp(); guac_timestamp timestamp = guac_current_timestamp();
if (timestamp - last_ping_timestamp > GUAC_SYNC_FREQUENCY) { if (timestamp - last_ping_timestamp > GUAC_SYNC_FREQUENCY) {
/* Record time of last synnc */
last_ping_timestamp = timestamp; last_ping_timestamp = timestamp;
if (
guac_send_sync(io, client->last_sent_timestamp) /* Send sync */
|| guac_flush(io) if (guac_send_sync(io, client->last_sent_timestamp)) {
) { guac_log_error("Error sending \"sync\" instruction: %s", guac_status_string(guac_error));
guac_client_stop(client); guac_client_stop(client);
return NULL; return NULL;
} }
/* Flush */
if (guac_flush(io)) {
guac_log_error("Error flushing output: %s", guac_status_string(guac_error));
guac_client_stop(client);
return NULL;
}
} }
/* Handle server messages */ /* Handle server messages */
@ -80,7 +91,7 @@ void* __guac_client_output_thread(void* data) {
int retval = client->handle_messages(client); int retval = client->handle_messages(client);
if (retval) { if (retval) {
guac_log_error("Error handling server messages"); guac_log_error("Error handling server messages: %s", guac_status_string(guac_error));
guac_client_stop(client); guac_client_stop(client);
return NULL; return NULL;
} }
@ -91,11 +102,13 @@ void* __guac_client_output_thread(void* data) {
/* Send sync instruction */ /* Send sync instruction */
client->last_sent_timestamp = guac_current_timestamp(); client->last_sent_timestamp = guac_current_timestamp();
if (guac_send_sync(io, client->last_sent_timestamp)) { if (guac_send_sync(io, client->last_sent_timestamp)) {
guac_log_error("Error sending \"sync\" instruction: %s", guac_status_string(guac_error));
guac_client_stop(client); guac_client_stop(client);
return NULL; return NULL;
} }
if (guac_flush(io)) { if (guac_flush(io)) {
guac_log_error("Error flushing output: %s", guac_status_string(guac_error));
guac_client_stop(client); guac_client_stop(client);
return NULL; return NULL;
} }
@ -133,12 +146,14 @@ void* __guac_client_input_thread(void* data) {
/* Stop on error */ /* Stop on error */
if (instruction == NULL) { if (instruction == NULL) {
guac_log_error("Error reading instruction: %s", guac_status_string(guac_error));
guac_client_stop(client); guac_client_stop(client);
return NULL; return NULL;
} }
/* Call handler, stop on error */ /* Call handler, stop on error */
if (guac_client_handle_instruction(client, instruction) < 0) { if (guac_client_handle_instruction(client, instruction) < 0) {
guac_log_error("Error in client \"%s\" instruction handler: %s", instruction->opcode, guac_status_string(guac_error));
guac_free_instruction(instruction); guac_free_instruction(instruction);
guac_client_stop(client); guac_client_stop(client);
return NULL; return NULL;