Additional logging, moderate cleanup.

[guacd.git] / src / daemon.c

diff --git a/src/daemon.c b/src/daemon.c
index bc352f3..bd30a8e 100644 (file)
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -64,19 +64,25 @@ void* start_client_thread(void* data) {
 
     guac_client* client;
     guac_client_plugin* plugin;
-    client_thread_data* thread_data = (client_thread_data*) data;
-    guac_socket* socket;
     guac_instruction* select;
     guac_instruction* connect;
 
+    /* Get thread data */
+    client_thread_data* thread_data = (client_thread_data*) data;
+
     /* Open guac_socket */
-    socket = guac_socket_open(thread_data->fd);
+    guac_socket* socket = guac_socket_open(thread_data->fd);
 
     /* Get protocol from select instruction */
-    select =
-        guac_protocol_expect_instruction(socket, GUAC_USEC_TIMEOUT, "select");
+    select = guac_protocol_expect_instruction(
+            socket, GUAC_USEC_TIMEOUT, "select");
     if (select == NULL) {
-        /* TODO: LOG */
+
+        /* Log error */
+        syslog(LOG_ERR, "Error reading \"select\": %s",
+                guac_status_string(guac_error));
+
+        /* Free resources */
         guac_socket_close(socket);
         free(data);
         return NULL;
@@ -84,18 +90,30 @@ void* start_client_thread(void* data) {
 
     /* Validate args to select */
     if (select->argc != 1) {
-        guac_error = GUAC_STATUS_BAD_ARGUMENT;
+
+        /* Log error */
+        syslog(LOG_ERR, "Bad number of arguments to \"select\" (%i)",
+                select->argc);
+
+        /* Free resources */
         guac_socket_close(socket);
         free(data);
         return NULL;
     }
 
+    syslog(LOG_INFO, "Protocol \"%s\" selected", select->argv[0]);
+
     /* Get plugin from protocol in select */
     plugin = guac_client_plugin_open(select->argv[0]);
     guac_instruction_free(select);
 
     if (plugin == NULL) {
-        /* TODO: LOG ERROR */
+
+        /* Log error */
+        syslog(LOG_ERR, "Error loading client plugin: %s",
+                guac_status_string(guac_error));
+
+        /* Free resources */
         guac_socket_close(socket);
         free(data);
         return NULL;
@@ -105,9 +123,12 @@ void* start_client_thread(void* data) {
     if (guac_protocol_send_args(socket, plugin->args)
             || guac_socket_flush(socket)) {
 
-        if (guac_client_plugin_close(plugin)) {
-            /* TODO: LOG ERROR */
-        }
+        /* Log error */
+        syslog(LOG_ERR, "Error sending \"args\": %s",
+                guac_status_string(guac_error));
+
+        if (guac_client_plugin_close(plugin))
+            syslog(LOG_ERR, "Error closing client plugin");
 
         guac_socket_close(socket);
         free(data);
@@ -115,13 +136,16 @@ void* start_client_thread(void* data) {
     }
 
     /* Get args from connect instruction */
-    connect =
-        guac_protocol_expect_instruction(socket, GUAC_USEC_TIMEOUT, "connect");
+    connect = guac_protocol_expect_instruction(
+            socket, GUAC_USEC_TIMEOUT, "connect");
     if (connect == NULL) {
 
-        if (guac_client_plugin_close(plugin)) {
-            /* TODO: LOG ERROR */
-        }
+        /* Log error */
+        syslog(LOG_ERR, "Error reading \"connect\": %s",
+                guac_status_string(guac_error));
+
+        if (guac_client_plugin_close(plugin))
+            syslog(LOG_ERR, "Error closing client plugin");
 
         guac_socket_close(socket);
         free(data);
@@ -131,13 +155,15 @@ void* start_client_thread(void* data) {
     /* Load and init client */
     client = guac_client_plugin_get_client(plugin, socket,
             connect->argc, connect->argv); 
-    guac_instruction_free(select);
+    guac_instruction_free(connect);
 
     if (client == NULL) {
 
-        if (guac_client_plugin_close(plugin)) {
-            /* TODO: LOG ERROR */
-        }
+        syslog(LOG_ERR, "Error instantiating client: %s",
+                guac_status_string(guac_error));
+
+        if (guac_client_plugin_close(plugin))
+            syslog(LOG_ERR, "Error closing client plugin");
 
         guac_socket_close(socket);
         free(data);
@@ -145,13 +171,16 @@ void* start_client_thread(void* data) {
     }
 
     /* Start client threads */
-    guac_start_client(client);
+    syslog(LOG_INFO, "Starting client");
+    if (guac_start_client(client))
+        syslog(LOG_ERR, "Client finished abnormally");
+    else
+        syslog(LOG_INFO, "Client finished normally");
 
     /* Clean up */
     guac_client_free(client);
-    if (guac_client_plugin_close(plugin)) {
-        /* TODO: LOG ERROR */
-    }
+    if (guac_client_plugin_close(plugin))
+        syslog(LOG_ERR, "Error closing client plugin");
 
     /* Close socket */
     guac_socket_close(socket);
@@ -264,7 +293,7 @@ int main(int argc, char* argv[]) {
 #endif
 
     /* Otherwise, this is the daemon */
-    syslog(LOG_INFO, "Started, listening on port %i", listen_port);
+    syslog(LOG_INFO, "Listening on port %i", listen_port);
 
     /* Ignore SIGPIPE */
     if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {