kolan
/
gkrellm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch from printf() to gkrellm_debug() and add more debug logging for client-connections

This commit is contained in:
Stefan Gehn 2010-06-12 19:39:28 +00:00
parent 22fd09df22
commit 4ff5bbfeb9
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/client.c
View File

@ -1562,8 +1562,8 @@ client_send_to_server(gchar *buf)
#endif #endif
if (n < 0 && errno == EPIPE) if (n < 0 && errno == EPIPE)
{ {
if (_GK.debug_level & DEBUG_CLIENT) gkrellm_debug(DEBUG_CLIENT, "Write on closed pipe to gkrellmd " \
printf("Write on closed pipe to gkrellmd server.\n"); "server, marking server-connection as dead\n");
server_alive = FALSE; server_alive = FALSE;
return FALSE; return FALSE;
} }
@ -1651,8 +1651,7 @@ gkrellm_getline(gint fd, gchar *buf, gint len)
fprintf(stderr, "Broken server connection\n"); fprintf(stderr, "Broken server connection\n");
exit(0); exit(0);
} }
if (_GK.debug_level & DEBUG_CLIENT) gkrellm_debug(DEBUG_CLIENT, "%s\n", buf);
printf("%s\n", buf);
return n; return n;
} }
@ -1701,6 +1700,8 @@ read_server_setup(gint fd)
gchar buf[256]; gchar buf[256];
gint table_size; gint table_size;
gkrellm_debug(DEBUG_CLIENT, "read_server_setup()\n");
/* Pre 2.1.6 gkrellmd does not send <decimal_point>, so put a fallback /* Pre 2.1.6 gkrellmd does not send <decimal_point>, so put a fallback
| locale_sync() here. | locale_sync() here.
*/ */
@ -1714,8 +1715,8 @@ read_server_setup(gint fd)
while (1) while (1)
{ {
rs=gkrellm_getline(fd, buf, sizeof(buf)); rs = gkrellm_getline(fd, buf, sizeof(buf));
if(rs<0) if (rs < 0)
return FALSE; return FALSE;
if (!strcmp(buf, "</gkrellmd_setup>")) if (!strcmp(buf, "</gkrellmd_setup>"))
break; break;
@ -1732,8 +1733,8 @@ read_server_setup(gint fd)
table_size = sizeof(update_table) / sizeof(KeyTable); table_size = sizeof(update_table) / sizeof(KeyTable);
while (1) while (1)
{ {
rs=gkrellm_getline(fd, buf, sizeof(buf)); rs = gkrellm_getline(fd, buf, sizeof(buf));
if(rs<0) if (rs < 0)
return FALSE; return FALSE;
if (!strcmp(buf, "</initial_update>")) if (!strcmp(buf, "</initial_update>"))
break; break;
@ -1747,7 +1748,11 @@ void
gkrellm_client_mode_disconnect(void) gkrellm_client_mode_disconnect(void)
{ {
if (client_fd >= 0) if (client_fd >= 0)
{
gkrellm_debug(DEBUG_CLIENT, "gkrellm_client_mode_disconnect(); " \
"closing connection to server\n");
close(client_fd); close(client_fd);
}
client_fd = -1; client_fd = -1;
server_alive = FALSE; server_alive = FALSE;
gdk_input_remove(client_input_id); gdk_input_remove(client_input_id);
@ -1764,6 +1769,8 @@ read_server_input(gpointer data, gint fd, GdkInputCondition condition)
count = recv(fd, server_buf + buf_index, n, 0); count = recv(fd, server_buf + buf_index, n, 0);
if (count <= 0) if (count <= 0)
{ {
gkrellm_debug(DEBUG_CLIENT, "read_server_input(); recv() " \
"returned error, disconnecting from server\n", count);
gkrellm_client_mode_disconnect(); gkrellm_client_mode_disconnect();
return; return;
} }
@ -1775,8 +1782,7 @@ read_server_input(gpointer data, gint fd, GdkInputCondition condition)
while (*line && (eol = strchr(line, '\n')) != NULL) while (*line && (eol = strchr(line, '\n')) != NULL)
{ {
*eol = '\0'; *eol = '\0';
if (_GK.debug_level & DEBUG_CLIENT) gkrellm_debug(DEBUG_CLIENT, "%s\n", line);
printf("%s\n", line);
process_server_line(&update_table[0], table_size, line); process_server_line(&update_table[0], table_size, line);
line = eol + 1; line = eol + 1;
} }
@ -1825,8 +1831,7 @@ gkrellm_connect_to(gchar *server, gint server_port)
if ((fd = socket(res->ai_family, res->ai_socktype, if ((fd = socket(res->ai_family, res->ai_socktype,
res->ai_protocol)) < 0) res->ai_protocol)) < 0)
continue; continue;
if (_GK.debug_level & DEBUG_CLIENT) gkrellm_debug(DEBUG_CLIENT, "\t[gkrellm_connect_to: (%d,%d,%d) %s:%d]\n",
printf("\t[gkrellm_connect_to: (%d,%d,%d) %s:%d]\n",
res->ai_family, res->ai_socktype, res->ai_family, res->ai_socktype,
res->ai_protocol, server, server_port); res->ai_protocol, server, server_port);
if (connect(fd, res->ai_addr, res->ai_addrlen) >= 0) if (connect(fd, res->ai_addr, res->ai_addrlen) >= 0)
@ -1840,8 +1845,8 @@ gkrellm_connect_to(gchar *server, gint server_port)
} }
freeaddrinfo(res0); freeaddrinfo(res0);
#else #else
if (_GK.debug_level & DEBUG_CLIENT) gkrellm_debug(DEBUG_CLIENT, "\t[gkrellm_connect_to: %s:%d]\n", server,
printf("\t[gkrellm_connect_to: %s:%d]\n", server, server_port); server_port);
addr = gethostbyname(server); addr = gethostbyname(server);
if (addr) if (addr)
{ {
@ -1854,6 +1859,7 @@ gkrellm_connect_to(gchar *server, gint server_port)
s.sin_port = htons(server_port); s.sin_port = htons(server_port);
if (connect(fd, (struct sockaddr *)&s, sizeof (s)) < 0) if (connect(fd, (struct sockaddr *)&s, sizeof (s)) < 0)
{ {
gkrellm_debug(DEBUG_CLIENT, "gkrellm_connect_to(); connect() failed\n");
#ifdef WIN32 #ifdef WIN32
closesocket(fd); closesocket(fd);
#else #else
@ -1863,6 +1869,10 @@ gkrellm_connect_to(gchar *server, gint server_port)
} }
} }
} }
else
{
gkrellm_debug(DEBUG_CLIENT, "gkrellm_connect_to(); gethostbyname() failed\n");
}
#endif #endif
if (fd < 0) if (fd < 0)
return -1; return -1;
@ -1908,7 +1918,6 @@ gkrellm_client_mode_connect(void)
(GdkInputFunction) read_server_input, NULL); (GdkInputFunction) read_server_input, NULL);
server_alive = TRUE; server_alive = TRUE;
return GOOD_CONNECT; return GOOD_CONNECT;
} }