aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-12-04 14:46:30 -05:00
Code

Cleanup: Removed <threadpool> completly.

Browse Source 
This adds a error level log line to the block in case unknown nodes are used
as we do for other blocks already.

Closes: #2085
This commit is contained in:
Philipp Schafft 2018-11-09 07:12:07 +00:00
parent 03249ff5f4
commit fbddf8d2f0
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cfgfile.c
View File

@ -1164,9 +1164,6 @@ static void _parse_limits(xmlDocPtr doc,
__read_int(doc, node, &configuration->body_size_limit, "<bodysize> must not be empty."); __read_int(doc, node, &configuration->body_size_limit, "<bodysize> must not be empty.");
} else if (xmlStrcmp(node->name, XMLSTR("queue-size")) == 0) { } else if (xmlStrcmp(node->name, XMLSTR("queue-size")) == 0) {
__read_unsigned_int(doc, node, &configuration->queue_size_limit, "<queue-size> must not be empty."); __read_unsigned_int(doc, node, &configuration->queue_size_limit, "<queue-size> must not be empty.");
} else if (xmlStrcmp(node->name, XMLSTR("threadpool")) == 0) {
ICECAST_LOG_WARN("<threadpool> functionality was removed in Icecast"
" version 2.3.0, please remove this from your config.");
} else if (xmlStrcmp(node->name, XMLSTR("client-timeout")) == 0) { } else if (xmlStrcmp(node->name, XMLSTR("client-timeout")) == 0) {
__read_int(doc, node, &configuration->client_timeout, "<client-timeout> must not be empty."); __read_int(doc, node, &configuration->client_timeout, "<client-timeout> must not be empty.");
} else if (xmlStrcmp(node->name, XMLSTR("header-timeout")) == 0) { } else if (xmlStrcmp(node->name, XMLSTR("header-timeout")) == 0) {
@ -1184,6 +1181,8 @@ static void _parse_limits(xmlDocPtr doc,
xmlFree(tmp); xmlFree(tmp);
} else if (xmlStrcmp(node->name, XMLSTR("burst-size")) == 0) { } else if (xmlStrcmp(node->name, XMLSTR("burst-size")) == 0) {
__read_unsigned_int(doc, node, &configuration->burst_size, "<burst-size> must not be empty."); __read_unsigned_int(doc, node, &configuration->burst_size, "<burst-size> must not be empty.");
} else if (node->type == XML_ELEMENT_NODE) {
ICECAST_LOG_ERROR("Unknown config tag: %s", node->name);
} }
} while ((node = node->next)); } while ((node = node->next));
} }