Make message-limit a server option.

This commit is contained in:
nicm
2014-03-31 21:41:35 +00:00
parent 1704d4a6b7
commit dca7d1c0fd
3 changed files with 13 additions and 17 deletions

View File

@ -655,7 +655,6 @@ void printflike2
status_message_set(struct client *c, const char *fmt, ...)
{
struct timeval tv;
struct session *s = c->session;
struct message_entry *msg;
va_list ap;
int delay;
@ -673,10 +672,7 @@ status_message_set(struct client *c, const char *fmt, ...)
msg->msg_time = time(NULL);
msg->msg = xstrdup(c->message_string);
if (s == NULL)
limit = 0;
else
limit = options_get_number(&s->options, "message-limit");
limit = options_get_number(&global_options, "message-limit");
if (ARRAY_LENGTH(&c->message_log) > limit) {
limit = ARRAY_LENGTH(&c->message_log) - limit;
for (i = 0; i < limit; i++) {