#include "miscutil.h"
#include "errlog.h"
#include "parsers.h"
+#include "urlmatch.h"
struct client_specific_tag
{
}
else
{
- log_error(LOG_LEVEL_TAGGING, "Enlisting tag '%s' for client %s",
+ log_error(LOG_LEVEL_TAGGING, "Enlisting tag '%s' for client %s.",
enabled_tags->name, client_address);
enlist(tag_list, enabled_tags->name);
}
while (enabled_tags != NULL)
{
log_error(LOG_LEVEL_TAGGING,
- "Evaluating tag '%s' for client %s. End of life %ld",
+ "Evaluating tag '%s' for client %s. End of life %ld.",
enabled_tags->name, client_address, enabled_tags->end_of_life);
if (enabled_tags->end_of_life)
{
if (client_has_requested_tag(csp->client_address, tag_name))
{
log_error(LOG_LEVEL_TAGGING,
- "Tag '%s' already enabled for client '%s'", tag->name, csp->client_address);
+ "Tag '%s' already enabled for client '%s'.",
+ tag->name, csp->client_address);
}
else
{
{
remove_tag_for_client(csp->client_address, tag_name);
log_error(LOG_LEVEL_TAGGING,
- "Tag '%s' disabled for client '%s'", tag->name, csp->client_address);
+ "Tag '%s' disabled for client '%s'.", tag->name, csp->client_address);
}
else
{
log_error(LOG_LEVEL_TAGGING,
- "Tag '%s' currently not set for client '%s'",
+ "Tag '%s' currently not set for client '%s'.",
tag->name, csp->client_address);
}
for (tag = tags->first; tag != NULL; tag = tag->next)
{
- if (0 == regexec(pattern->pattern.tag_regex, tag->str, 0, NULL, 0))
+ if (regex_matches(pattern->pattern.tag_regex, tag->str))
{
- log_error(LOG_LEVEL_TAGGING, "Client tag '%s' matches", tag->str);
+ log_error(LOG_LEVEL_TAGGING, "Client tag '%s' matches.", tag->str);
return 1;
}
}