devs/stabber
2
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Use log levels

Browse Source
This commit is contained in:
James Booth
2015-06-07 19:14:12 +01:00
parent 5dfe0a5786
commit d25f8c9acb
6 changed files with 67 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/httpapi.c
View File

@@ -123,7 +123,6 @@ int connection_cb(void* cls, struct MHD_Connection* conn, const char* url, const
switch (con_info->stbbr_op) { switch (con_info->stbbr_op) {
case STBBR_OP_SEND: case STBBR_OP_SEND:
log_println("STBBR_OP_SEND");
server_send(con_info->body->str); server_send(con_info->body->str);
return send_response(conn, NULL, MHD_HTTP_OK); return send_response(conn, NULL, MHD_HTTP_OK);
@@ -181,7 +180,7 @@ httpapi_start(int port)
return 0; return 0;
} }
log_println("HTTP daemon started on port: %d", port); log_println(STBBR_LOGINFO, "HTTP daemon started on port: %d", port);
return 1; return 1;
} }
@@ -190,5 +189,5 @@ void
httpapi_stop(void) httpapi_stop(void)
{ {
MHD_stop_daemon(httpdaemmon); MHD_stop_daemon(httpdaemmon);
log_println("HTTP daemon stopped."); log_println(STBBR_LOGINFO, "HTTP daemon stopped.");
} }

51
src/server/log.c
View File

@@ -121,25 +121,40 @@ log_init(stbbr_log_t loglevel)
free(log_file); free(log_file);
} }
void static char*
log_println(const char * const msg, ...) _levelstr(stbbr_log_t loglevel)
{ {
va_list arg; switch (loglevel) {
va_start(arg, msg); case STBBR_LOGERROR: return "ERROR";
GString *fmt_msg = g_string_new(NULL); case STBBR_LOGWARN: return "WARN";
g_string_vprintf(fmt_msg, msg, arg); case STBBR_LOGINFO: return "INFO";
GTimeZone *tz = g_time_zone_new_local(); case STBBR_LOGDEBUG: return "DEBUG";
GDateTime *dt = g_date_time_new_now(tz); default: return "";
gchar *date_fmt = g_date_time_format(dt, "%d/%m/%Y %H:%M:%S"); }
char thr_name[16]; }
prctl(PR_GET_NAME, thr_name);
fprintf(logp, "%s: [%s] %s\n", date_fmt, thr_name, fmt_msg->str); void
g_date_time_unref(dt); log_println(stbbr_log_t loglevel, const char * const msg, ...)
g_time_zone_unref(tz); {
fflush(logp); if (loglevel >= minlevel) {
g_free(date_fmt); va_list arg;
g_string_free(fmt_msg, TRUE); va_start(arg, msg);
va_end(arg); GString *fmt_msg = g_string_new(NULL);
g_string_vprintf(fmt_msg, msg, arg);
GTimeZone *tz = g_time_zone_new_local();
GDateTime *dt = g_date_time_new_now(tz);
gchar *date_fmt = g_date_time_format(dt, "%d/%m/%Y %H:%M:%S");
char thr_name[16];
prctl(PR_GET_NAME, thr_name);
char *levelstr = _levelstr(loglevel);
fprintf(logp, "%s: [%s] [%s] %s\n", date_fmt, thr_name, levelstr, fmt_msg->str);
g_date_time_unref(dt);
g_time_zone_unref(tz);
fflush(logp);
g_free(date_fmt);
g_string_free(fmt_msg, TRUE);
va_end(arg);
}
} }
void void

2
src/server/log.h
View File

@@ -27,6 +27,6 @@
void log_init(stbbr_log_t loglevel); void log_init(stbbr_log_t loglevel);
void log_close(void); void log_close(void);
void log_println(const char * const msg, ...); void log_println(stbbr_log_t loglevel, const char * const msg, ...);
#endif #endif

51
src/server/server.c
View File

@@ -76,7 +76,7 @@ write_stream(const char * const stream)
// real error // real error
} else { } else {
log_println("Error sending on connection: %s", strerror(errno)); log_println(STBBR_LOGERROR, "Error sending on connection: %s", strerror(errno));
return; return;
} }
} }
@@ -85,7 +85,7 @@ write_stream(const char * const stream)
marker += sent; marker += sent;
} }
log_println("SENT: %s", stream); log_println(STBBR_LOGINFO, "SENT: %s", stream);
} }
int int
@@ -118,7 +118,7 @@ read_stream(void)
// client disconnect // client disconnect
if (read_size == 0) { if (read_size == 0) {
log_println("%s:%d - Client disconnected.", client->ip, client->port); log_println(STBBR_LOGINFO, "%s:%d - Client disconnected.", client->ip, client->port);
g_string_free(stream, TRUE); g_string_free(stream, TRUE);
return -1; return -1;
} }
@@ -133,7 +133,7 @@ read_stream(void)
// real error // real error
} else { } else {
log_println("Error receiving on connection: %s", strerror(errno)); log_println(STBBR_LOGERROR, "Error receiving on connection: %s", strerror(errno));
g_string_free(stream, TRUE); g_string_free(stream, TRUE);
return -1; return -1;
} }
@@ -143,10 +143,9 @@ read_stream(void)
parser_feed(buf, 1); parser_feed(buf, 1);
g_string_append_len(stream, buf, read_size); g_string_append_len(stream, buf, read_size);
if (g_str_has_suffix(stream->str, STREAM_END)) { if (g_str_has_suffix(stream->str, STREAM_END)) {
log_println("RECV: </stream:stream>"); log_println(STBBR_LOGINFO, "RECV: </stream:stream>");
log_println("--> Stream end callback fired"); log_println(STBBR_LOGINFO, "--> Stream end callback fired");
write_stream(STREAM_END); write_stream(STREAM_END);
log_println("STREAM END");
kill_recv = TRUE; kill_recv = TRUE;
} }
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
@@ -158,7 +157,7 @@ read_stream(void)
void void
stream_start_callback(void) stream_start_callback(void)
{ {
log_println("--> Stream start callback fired"); log_println(STBBR_LOGINFO, "--> Stream start callback fired");
write_stream(XML_START); write_stream(XML_START);
write_stream(STREAM_RESP); write_stream(STREAM_RESP);
@@ -168,7 +167,7 @@ stream_start_callback(void)
void void
auth_callback(XMPPStanza *stanza) auth_callback(XMPPStanza *stanza)
{ {
log_println("--> Auth callback fired"); log_println(STBBR_LOGINFO, "--> Auth callback fired");
const char *id = stanza_get_id(stanza); const char *id = stanza_get_id(stanza);
XMPPStanza *query = stanza_get_child_by_ns(stanza, "jabber:iq:auth"); XMPPStanza *query = stanza_get_child_by_ns(stanza, "jabber:iq:auth");
@@ -221,7 +220,7 @@ id_callback(const char *id)
{ {
char *stream = prime_get_for_id(id); char *stream = prime_get_for_id(id);
if (stream) { if (stream) {
log_println("--> ID callback fired for '%s'", id); log_println(STBBR_LOGINFO, "--> ID callback fired for '%s'", id);
write_stream(stream); write_stream(stream);
} }
} }
@@ -231,7 +230,7 @@ query_callback(const char *query, const char *id)
{ {
XMPPStanza *stanza = prime_get_for_query(query); XMPPStanza *stanza = prime_get_for_query(query);
if (stanza) { if (stanza) {
log_println("--> QUERY callback fired for '%s'", query); log_println(STBBR_LOGINFO, "--> QUERY callback fired for '%s'", query);
stanza_set_id(stanza, id); stanza_set_id(stanza, id);
char *stream = stanza_to_string(stanza); char *stream = stanza_to_string(stanza);
write_stream(stream); write_stream(stream);
@@ -242,11 +241,11 @@ query_callback(const char *query, const char *id)
void void
server_wait_for(char *id) server_wait_for(char *id)
{ {
log_println("WAIT for stanza with id: %s", id); log_println(STBBR_LOGINFO, "WAIT for stanza with id: %s", id);
while (TRUE) { while (TRUE) {
int res = stanzas_contains_id(id); int res = stanzas_contains_id(id);
if (res) { if (res) {
log_println("WAIT complete for id: %s", id); log_println(STBBR_LOGINFO, "WAIT complete for id: %s", id);
return; return;
} }
usleep(1000 * 5); usleep(1000 * 5);
@@ -263,11 +262,11 @@ _start_server_cb(void* userdata)
// listen socket non blocking // listen socket non blocking
int res = fcntl(listen_socket, F_SETFL, fcntl(listen_socket, F_GETFL, 0) | O_NONBLOCK); int res = fcntl(listen_socket, F_SETFL, fcntl(listen_socket, F_GETFL, 0) | O_NONBLOCK);
if (res == -1) { if (res == -1) {
log_println("Error setting nonblocking on listen socket: %s", strerror(errno)); log_println(STBBR_LOGERROR, "Error setting nonblocking on listen socket: %s", strerror(errno));
return NULL; return NULL;
} }
log_println("Waiting for incoming connection..."); log_println(STBBR_LOGINFO, "Waiting for incoming connection...");
// wait for connection // wait for connection
int c = sizeof(struct sockaddr_in); int c = sizeof(struct sockaddr_in);
@@ -275,7 +274,7 @@ _start_server_cb(void* userdata)
errno = 0; errno = 0;
while ((client_socket = accept(listen_socket, (struct sockaddr *)&client_addr, (socklen_t*)&c)) == -1) { while ((client_socket = accept(listen_socket, (struct sockaddr *)&client_addr, (socklen_t*)&c)) == -1) {
if (errno != EAGAIN && errno != EWOULDBLOCK) { if (errno != EAGAIN && errno != EWOULDBLOCK) {
log_println("Accept failed: %s", strerror(errno)); log_println(STBBR_LOGERROR, "Accept failed: %s", strerror(errno));
return NULL; return NULL;
} }
errno = 0; errno = 0;
@@ -285,7 +284,7 @@ _start_server_cb(void* userdata)
// client socket non blocking // client socket non blocking
res = fcntl(client_socket, F_SETFL, fcntl(client_socket, F_GETFL, 0) | O_NONBLOCK); res = fcntl(client_socket, F_SETFL, fcntl(client_socket, F_GETFL, 0) | O_NONBLOCK);
if (res == -1) { if (res == -1) {
log_println("Error setting nonblocking on client socket: %s", strerror(errno)); log_println(STBBR_LOGERROR, "Error setting nonblocking on client socket: %s", strerror(errno));
return NULL; return NULL;
} }
@@ -309,13 +308,13 @@ server_run(stbbr_log_t loglevel, int port, int httpport)
verify_set_timeout(10); verify_set_timeout(10);
log_init(loglevel); log_init(loglevel);
log_println("Starting on port: %d...", port); log_println(STBBR_LOGINFO, "Starting on port: %d...", port);
// create listen socket // create listen socket
errno = 0; errno = 0;
listen_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_IP); listen_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
if (listen_socket == -1) { if (listen_socket == -1) {
log_println("Could not create socket: %s", strerror(errno)); log_println(STBBR_LOGERROR, "Could not create socket: %s", strerror(errno));
_shutdown(); _shutdown();
return -1; return -1;
} }
@@ -328,7 +327,7 @@ server_run(stbbr_log_t loglevel, int port, int httpport)
int reuse = 1; int reuse = 1;
int ret = setsockopt(listen_socket, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse)); int ret = setsockopt(listen_socket, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse));
if (ret == -1) { if (ret == -1) {
log_println("Set socket options failed: %s", strerror(errno)); log_println(STBBR_LOGERROR, "Set socket options failed: %s", strerror(errno));
_shutdown(); _shutdown();
return -1; return -1;
} }
@@ -337,7 +336,7 @@ server_run(stbbr_log_t loglevel, int port, int httpport)
errno = 0; errno = 0;
ret = bind(listen_socket, (struct sockaddr *)&server_addr, sizeof(server_addr)); ret = bind(listen_socket, (struct sockaddr *)&server_addr, sizeof(server_addr));
if (ret == -1) { if (ret == -1) {
log_println("Bind failed: %s", strerror(errno)); log_println(STBBR_LOGERROR, "Bind failed: %s", strerror(errno));
_shutdown(); _shutdown();
return -1; return -1;
} }
@@ -346,7 +345,7 @@ server_run(stbbr_log_t loglevel, int port, int httpport)
errno = 0; errno = 0;
ret = listen(listen_socket, 5); ret = listen(listen_socket, 5);
if (ret == -1) { if (ret == -1) {
log_println("Listen failed: %s", strerror(errno)); log_println(STBBR_LOGERROR, "Listen failed: %s", strerror(errno));
_shutdown(); _shutdown();
return -1; return -1;
} }
@@ -385,7 +384,7 @@ void
server_stop(void) server_stop(void)
{ {
if (!kill_recv) { if (!kill_recv) {
log_println("SERVER STOP"); log_println(STBBR_LOGINFO, "SERVER STOP");
kill_recv = TRUE; kill_recv = TRUE;
pthread_join(server_thread, NULL); pthread_join(server_thread, NULL);
} }
@@ -394,7 +393,7 @@ server_stop(void)
static void static void
_shutdown(void) _shutdown(void)
{ {
log_println("SHUTDOWN"); log_println(STBBR_LOGINFO, "SHUTDOWN");
if (httpapi_run) { if (httpapi_run) {
httpapi_stop(); httpapi_stop();
@@ -417,7 +416,7 @@ _shutdown(void)
send_queue = NULL; send_queue = NULL;
pthread_mutex_unlock(&send_queue_lock); pthread_mutex_unlock(&send_queue_lock);
log_println(""); log_println(STBBR_LOGINFO, "");
log_println(""); log_println(STBBR_LOGINFO, "");
log_close(); log_close();
} }

4
src/server/stream_parser.c
View File

@@ -46,7 +46,7 @@ static void
start_element(void *data, const char *element, const char **attributes) start_element(void *data, const char *element, const char **attributes)
{ {
if (g_strcmp0(element, "stream:stream") == 0) { if (g_strcmp0(element, "stream:stream") == 0) {
log_println("RECV: %s", curr_string->str); log_println(STBBR_LOGINFO, "RECV: %s", curr_string->str);
stream_start_cb(); stream_start_cb();
do_reset = 1; do_reset = 1;
return; return;
@@ -74,7 +74,7 @@ end_element(void *data, const char *element)
stanza_add_child(curr_stanza->parent, curr_stanza); stanza_add_child(curr_stanza->parent, curr_stanza);
curr_stanza = curr_stanza->parent; curr_stanza = curr_stanza->parent;
} else { } else {
log_println("RECV: %s", curr_string->str); log_println(STBBR_LOGINFO, "RECV: %s", curr_string->str);
stanzas_add(curr_stanza); stanzas_add(curr_stanza);
if (stanza_get_child_by_ns(curr_stanza, "jabber:iq:auth")) { if (stanza_get_child_by_ns(curr_stanza, "jabber:iq:auth")) {
auth_cb(curr_stanza); auth_cb(curr_stanza);

8
src/server/verify.c
View File

@@ -64,9 +64,9 @@ verify_any(char *stanza_text)
} }
if (result) { if (result) {
log_println("VERIFY SUCCESS: %s", stanza_text); log_println(STBBR_LOGINFO, "VERIFY SUCCESS: %s", stanza_text);
} else { } else {
log_println("VERIFY FAIL: %s", stanza_text); log_println(STBBR_LOGINFO, "VERIFY FAIL: %s", stanza_text);
} }
return result; return result;
@@ -95,9 +95,9 @@ verify_last(char *stanza_text)
} }
if (result) { if (result) {
log_println("VERIFY LAST SUCCESS: %s", stanza_text); log_println(STBBR_LOGINFO, "VERIFY LAST SUCCESS: %s", stanza_text);
} else { } else {
log_println("VERIFY LAST FAIL: %s", stanza_text); log_println(STBBR_LOGINFO, "VERIFY LAST FAIL: %s", stanza_text);
} }
return result; return result;