--- a/TODO Sat Feb 21 16:10:28 2009 +0200
+++ b/TODO Mon Feb 23 15:42:07 2009 +0200
@@ -1,4 +1,5 @@
Verify refcounts of lm objects. Need a decent test script for that.
Some additional lua functions?
+Merge sending functions, add enum to specify blocking and raw modes
--- a/lm_connection.c Sat Feb 21 16:10:28 2009 +0200
+++ b/lm_connection.c Mon Feb 23 15:42:07 2009 +0200
@@ -98,7 +98,7 @@
// XXX lm_connection_unref (connection);
lua_pushboolean (cb->L, success);
if (lua_pcall (cb->L, 2, 0, 0)) {
- E ("Connection callback error: %s", lua_tostring (cb->L, -1));
+ W ("Connection callback error: %s", lua_tostring (cb->L, -1));
lua_pop (cb->L, 1);
}
}
@@ -124,7 +124,7 @@
else {
lua_pushnil (L);
lua_pushstring (L, err->message);
- W ("Connection opening failed");
+ I ("Connection opening failed");
return 2;
}
}
@@ -156,7 +156,7 @@
} else {
lua_pushnil (L);
lua_pushstring (L, err->message);
- W ("Connection authentication failed: %s", err->message);
+ I ("Connection authentication failed: %s", err->message);
return 2;
}
}
@@ -227,7 +227,7 @@
lua_pushnumber (L, lm_connection_get_keep_alive_rate (object->connection));
return 1;
#else
- E ("Sorry, your loudmouth have no get_keep_alive_rate ()");
+ W ("Sorry, your loudmouth have no get_keep_alive_rate ()");
lua_pushnil (L);
lua_pushstring (L, "Sorry, your loudmouth have no get_keep_alive_rate ()");
return 2;
@@ -291,7 +291,7 @@
if (lm_connection_close (object->connection, &err))
return 1;
else {
- W ("Connection close failed: %s", err->message);
+ I ("Connection close failed: %s", err->message);
lua_pushnil (L);
lua_pushstring (L, err->message);
return 2;
@@ -344,7 +344,7 @@
if (status)
return 1;
else {
- W ("Message sending failed: %s", err->message);
+ I ("Message sending failed: %s", err->message);
lua_pushnil (L);
lua_pushstring (L, err->message);
return 2;
@@ -364,7 +364,7 @@
lua_pop (L, 1);
return 1;
} else {
- W ("Raw message sending failed: %s", err->message);
+ I ("Raw message sending failed: %s", err->message);
lua_pushnil (L);
lua_pushstring (L, err->message);
return 2;
@@ -426,7 +426,7 @@
// XXX lm_connection_unref (connection);
luaL_pushenum (cb->L, reason, llm_disconnect_reason);
if (lua_pcall (cb->L, 2, 0, 0)) {
- E ("Disconnect callback error: %s", lua_tostring (cb->L, -1));
+ W ("Disconnect callback error: %s", lua_tostring (cb->L, -1));
lua_pop (cb->L, 1);
}
}
@@ -461,7 +461,7 @@
if (lm_connection_open_and_block (object->connection, &err))
return 1;
else {
- W ("Synchronous connection opening failed: %s", err->message);
+ I ("Synchronous connection opening failed: %s", err->message);
lua_pushnil (L);
lua_pushstring (L, err->message);
return 2;
@@ -483,7 +483,7 @@
password, resource, &err))
return 1;
else {
- W ("Synchronous authentication failed: %s", err->message);
+ I ("Synchronous authentication failed: %s", err->message);
lua_pushnil (L);
lua_pushstring (L, err->message);
return 2;
@@ -502,7 +502,7 @@
LmMessage *new = lm_connection_send_with_reply_and_block (object->connection,
message->message, &err);
if (!new) {
- W ("Synchronous message sending failed: %s", err->message);
+ I ("Synchronous message sending failed: %s", err->message);
lua_pushnil (L);
lua_pushstring (L, err->message);
return 2;
--- a/lm_message_handler.c Sat Feb 21 16:10:28 2009 +0200
+++ b/lm_message_handler.c Mon Feb 23 15:42:07 2009 +0200
@@ -26,7 +26,7 @@
llm_message_bless (cb->L, message);
// XXX lm_message_unref (message);
if (lua_pcall (cb->L, 2, 1, 0)) {
- E ("Message handler callback error: %s", lua_tostring (cb->L, -1));
+ W ("Message handler callback error: %s", lua_tostring (cb->L, -1));
lua_pop (cb->L, 1);
return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
}
--- a/lm_ssl.c Sat Feb 21 16:10:28 2009 +0200
+++ b/lm_ssl.c Mon Feb 23 15:42:07 2009 +0200
@@ -41,7 +41,7 @@
// XXX lm_ssl_unref (ssl);
luaL_pushenum (cb->L, status, llm_ssl_status);
if (lua_pcall (cb->L, 2, 0, 0)) {
- E ("SSL callback error: %s", lua_tostring (cb->L, -1));
+ W ("SSL callback error: %s", lua_tostring (cb->L, -1));
lua_pop (cb->L, 1);
return LM_SSL_RESPONSE_CONTINUE;
}