Because of change in libqb (9abb686) logging of TOTEM subsystem stopped
working.
Instead of rely on previous behavior (implicit substring match), all
totem files are now explicitly given.
Also QB subsystem now uses comma separated filelist instead of previous
function calling.
Signed-off-by: Jan Friesse <jfriesse@xxxxxxxxxx>
---
exec/logsys.c | 33 +++++++--------------------------
exec/main.c | 5 ++++-
2 files changed, 11 insertions(+), 27 deletions(-)
diff --git a/exec/logsys.c b/exec/logsys.c
index b1abe9d..45f1b06 100644
--- a/exec/logsys.c
+++ b/exec/logsys.c
@@ -301,39 +301,20 @@ int _logsys_system_setup(
(strlen(mainsystem) >= LOGSYS_MAX_SUBSYS_NAMELEN)) {
return -1;
}
+
/*
* Setup libqb as a subsys
*/
- i = _logsys_subsys_create ("QB", "array.c");
+ i = _logsys_subsys_create ("QB", "array.c,log.c,log_syslog.c,log_blackbox.c,log_format.c,"
+ "log_file.c,log_dcs.c,log_thread.c,ipc_shm.c,ipcs.c,ipc_us.c,loop.c,"
+ "loop_poll_epoll.c,loop_job.c,loop_poll_poll.c,loop_poll_kqueue.c,"
+ "loop_timerlist.c,loop_poll.c,ringbuffer.c,ringbuffer_helper.c,trie.c,"
+ "map.c,skiplist.c,rpl_sem.c,hdb.c,unix.c,hashtable.c,strlcpy.c,ipc_socket.c,"
+ "strchrnul.c,ipc_setup.c,strlcat.c");
if (i < 0) {
return -1;
}
- _logsys_subsys_filename_add (i, "log.c");
- _logsys_subsys_filename_add (i, "log_syslog.c");
- _logsys_subsys_filename_add (i, "log_blackbox.c");
- _logsys_subsys_filename_add (i, "log_format.c");
- _logsys_subsys_filename_add (i, "log_file.c");
- _logsys_subsys_filename_add (i, "log_dcs.c");
- _logsys_subsys_filename_add (i, "log_thread.c");
- _logsys_subsys_filename_add (i, "ipc_shm.c");
- _logsys_subsys_filename_add (i, "ipcs.c");
- _logsys_subsys_filename_add (i, "ipc_us.c");
- _logsys_subsys_filename_add (i, "loop.c");
- _logsys_subsys_filename_add (i, "loop_poll_epoll.c");
- _logsys_subsys_filename_add (i, "loop_job.c");
- _logsys_subsys_filename_add (i, "loop_poll_poll.c");
- _logsys_subsys_filename_add (i, "loop_poll_kqueue.c");
- _logsys_subsys_filename_add (i, "loop_timerlist.c");
- _logsys_subsys_filename_add (i, "loop_poll.c");
- _logsys_subsys_filename_add (i, "ringbuffer.c");
- _logsys_subsys_filename_add (i, "ringbuffer_helper.c");
- _logsys_subsys_filename_add (i, "trie.c");
- _logsys_subsys_filename_add (i, "map.c");
- _logsys_subsys_filename_add (i, "skiplist.c");
- _logsys_subsys_filename_add (i, "rpl_sem.c");
- _logsys_subsys_filename_add (i, "hdb.c");
- _logsys_subsys_filename_add (i, "unix.c");
/*
* name clash
* _logsys_subsys_filename_add (i, "util.c");
diff --git a/exec/main.c b/exec/main.c
index 0b2daf3..3229b47 100644
--- a/exec/main.c
+++ b/exec/main.c
@@ -1218,7 +1218,10 @@ int main (int argc, char **argv, char **envp)
ip_version = totem_config.ip_version;
totem_config.totem_logging_configuration = totem_logging_configuration;
- totem_config.totem_logging_configuration.log_subsys_id = _logsys_subsys_create("TOTEM", "totem");
+ totem_config.totem_logging_configuration.log_subsys_id = _logsys_subsys_create("TOTEM", "totem,"
+ "totemmrp.c,totemrrp.c,totemip.c,totemconfig.c,totemcrypto.c,totemsrp.c,"
+ "totempg.c,totemiba.c,totemudp.c,totemudpu.c,totemnet.c");
+
totem_config.totem_logging_configuration.log_level_security = LOGSYS_LEVEL_WARNING;
totem_config.totem_logging_configuration.log_level_error = LOGSYS_LEVEL_ERROR;
totem_config.totem_logging_configuration.log_level_warning = LOGSYS_LEVEL_WARNING;
--
1.7.1
_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss
