cl_log: Always print the common log entity to syslog messages
Pacemaker logs a lot of messages to system logs and always
with different entities. As different entities are difficult
to filter out with a generic rule, we always add the common
log entity for syslog messages. That allows to write a simple
filter rules
Signed-off-by: Bernd Schubert <bschub...@ddn.com>
diff --git a/lib/clplumbing/cl_log.c b/lib/clplumbing/cl_log.c
--- a/lib/clplumbing/cl_log.c
+++ b/lib/clplumbing/cl_log.c
@@ -543,7 +543,7 @@ cl_direct_log(int priority, const char*
int needprivs = !cl_have_full_privs();
if (entity == NULL){
- entity =cl_log_entity;
+ entity = cl_log_entity;
}
pristr = use_priority_str ? prio2str(priority) : "";
@@ -553,13 +553,10 @@ cl_direct_log(int priority, const char*
}
if (syslog_enabled) {
- if (entity) {
- strncpy(common_log_entity, entity, MAXENTITY);
- } else {
- strncpy(common_log_entity, DFLT_ENTITY, MAXENTITY);
- }
-
- common_log_entity[MAXENTITY-1] = '\0';
+ if (!entity)
+ entity = "";
+ snprintf(common_log_entity, MAXENTITY, "%s %s",
+ cl_log_entity, entity);
syslog(priority, "[%d]: %s: %s%c",
entity_pid, pristr, buf, 0);
_______________________________________________
Pacemaker mailing list: Pacemaker@oss.clusterlabs.org
http://oss.clusterlabs.org/mailman/listinfo/pacemaker
Project Home: http://www.clusterlabs.org
Getting started: http://www.clusterlabs.org/doc/Cluster_from_Scratch.pdf
Bugs: http://developerbugs.linux-foundation.org/enter_bug.cgi?product=Pacemaker
