Browse Source

Send controller reply now accepts variadic args.

tags/0.7.2
Vsevolod Stakhov 9 years ago
parent
commit
d6ba63371f
2 changed files with 10 additions and 6 deletions
  1. 9
    4
      src/libserver/worker_util.c
  2. 1
    2
      src/libserver/worker_util.h

+ 9
- 4
src/libserver/worker_util.c View File

@@ -189,17 +189,22 @@ rspamd_worker_stop_accept (struct rspamd_worker *worker)

void
rspamd_controller_send_error (struct rspamd_http_connection_entry *entry,
gint code,
const gchar *error_msg)
gint code, const gchar *error_msg, ...)
{
struct rspamd_http_message *msg;
va_list args;

msg = rspamd_http_new_message (HTTP_RESPONSE);

va_start (args, error_msg);
msg->status = g_string_sized_new (128);
rspamd_vprintf_gstring (msg->status, error_msg, args);
va_end (args);

msg->date = time (NULL);
msg->code = code;
msg->body = g_string_sized_new (128);
msg->status = g_string_new (error_msg);
rspamd_printf_gstring (msg->body, "{\"error\":\"%s\"}", error_msg);
rspamd_printf_gstring (msg->body, "{\"error\":\"%v\"}", msg->status);
rspamd_http_connection_reset (entry->conn);
rspamd_http_connection_write_message (entry->conn,
msg,

+ 1
- 2
src/libserver/worker_util.h View File

@@ -80,8 +80,7 @@ struct rspamd_custom_controller_command {
* @param error_msg error message
*/
void rspamd_controller_send_error (struct rspamd_http_connection_entry *entry,
gint code,
const gchar *error_msg);
gint code, const gchar *error_msg, ...);

/**
* Send a custom string using HTTP

Loading…
Cancel
Save