From: "Fabio M. Di Nitto" <fdinitto@xxxxxxxxxx>
Signed-off-by: Fabio M. Di Nitto <fdinitto@xxxxxxxxxx>
---
exec/Makefile.am | 6 +-
exec/ipc_glue.c | 1 -
exec/logconfig.c | 603 +++++++++++++++++++++++++++++++++++++++++++++++++++++
exec/logconfig.h | 63 ++++++
exec/main.c | 6 +-
exec/mainconfig.c | 603 -----------------------------------------------------
exec/mainconfig.h | 63 ------
exec/service.c | 1 -
exec/util.h | 1 +
9 files changed, 673 insertions(+), 674 deletions(-)
create mode 100644 exec/logconfig.c
create mode 100644 exec/logconfig.h
delete mode 100644 exec/mainconfig.c
delete mode 100644 exec/mainconfig.h
diff --git a/exec/Makefile.am b/exec/Makefile.am
index 338cd46..2f0adef 100644
--- a/exec/Makefile.am
+++ b/exec/Makefile.am
@@ -31,7 +31,7 @@
MAINTAINERCLEANFILES = Makefile.in
-AM_CFLAGS = -fPIC -DMAINCONFIG_USE_ICMAP=1
+AM_CFLAGS = -fPIC -DLOGCONFIG_USE_ICMAP=1
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include $(nss_CFLAGS) $(rdmacm_CFLAGS) $(ibverbs_CFLAGS)
@@ -51,7 +51,7 @@ corosync_SOURCES = vsf_ykd.c coroparse.c vsf_quorum.c sync.c \
logsys.c cfg.c cmap.c cpg.c mon.c pload.c \
votequorum.c wd.c util.c schedwrk.c main.c \
apidef.c quorum.c icmap.c timer.c \
- ipc_glue.c service.c mainconfig.c totemconfig.c
+ ipc_glue.c service.c logconfig.c totemconfig.c
corosync_LDADD = -ltotem_pg -lcorosync_common $(LIBQB_LIBS) $(statgrab_LIBS)
corosync_DEPENDENCIES = libtotem_pg.so.$(SONAME) ../common_lib/libcorosync_common.so
corosync_LDFLAGS = $(OS_DYFLAGS) -L./ -L../common_lib
@@ -62,7 +62,7 @@ SHARED_LIBS = $(lib_LIBRARIES:%.a=%.so.$(SONAME))
SHARED_LIBS_SO = $(SHARED_LIBS:%.so.$(SONAME)=%.so)
SHARED_LIBS_SO_TWO = $(SHARED_LIBS:%.so.$(SONAME)=%.so.$(SOMAJOR))
-noinst_HEADERS = apidef.h mainconfig.h main.h \
+noinst_HEADERS = apidef.h logconfig.h main.h \
quorum.h service.h timer.h totemconfig.h \
totemmrp.h totemnet.h totemudp.h totemiba.h totemrrp.h \
totemudpu.h totemsrp.h util.h vsf.h schedwrk.h \
diff --git a/exec/ipc_glue.c b/exec/ipc_glue.c
index 592f9f6..a3f11c7 100644
--- a/exec/ipc_glue.c
+++ b/exec/ipc_glue.c
@@ -54,7 +54,6 @@
#include <corosync/logsys.h>
#include <corosync/icmap.h>
-#include "mainconfig.h"
#include "sync.h"
#include "timer.h"
#include "main.h"
diff --git a/exec/logconfig.c b/exec/logconfig.c
new file mode 100644
index 0000000..3608233
--- /dev/null
+++ b/exec/logconfig.c
@@ -0,0 +1,603 @@
+/*
+ * Copyright (c) 2002-2005 MontaVista Software, Inc.
+ * Copyright (c) 2006-2011 Red Hat, Inc.
+ *
+ * All rights reserved.
+ *
+ * Author: Steven Dake (sdake@xxxxxxxxxx)
+ * Jan Friesse (jfriesse@xxxxxxxxxx)
+ *
+ * This software licensed under BSD license, the text of which follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * - Neither the name of the MontaVista Software, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include <corosync/totem/totem.h>
+#include <corosync/logsys.h>
+#ifdef LOGCONFIG_USE_ICMAP
+#include <corosync/icmap.h>
+#define MAP_KEYNAME_MAXLEN ICMAP_KEYNAME_MAXLEN
+#define map_get_string(key_name, value) icmap_get_string(key_name, value)
+#else
+#include <corosync/cmap.h>
+static cmap_handle_t cmap_handle;
+static const char *main_logfile;
+#define MAP_KEYNAME_MAXLEN CMAP_KEYNAME_MAXLEN
+#define map_get_string(key_name, value) cmap_get_string(cmap_handle, key_name, value)
+#endif
+
+#include "util.h"
+#include "logconfig.h"
+
+static char error_string_response[512];
+
+/**
+ * insert_into_buffer
+ * @target_buffer: a buffer where to write results
+ * @bufferlen: tell us the size of the buffer to avoid overflows
+ * @entry: entry that needs to be added to the buffer
+ * @after: can either be NULL or set to a string.
+ * if NULL, @entry is prependend to logsys_format_get buffer.
+ * if set, @entry is added immediately after @after.
+ *
+ * Since the function is specific to logsys_format_get handling, it is implicit
+ * that source is logsys_format_get();
+ *
+ * In case of failure, target_buffer could be left dirty. So don't trust
+ * any data leftover in it.
+ *
+ * Searching for "after" assumes that there is only entry of "after"
+ * in the source. Afterall we control the string here and for logging format
+ * it makes little to no sense to have duplicate format entries.
+ *
+ * Returns: 0 on success, -1 on failure
+ **/
+static int insert_into_buffer(
+ char *target_buffer,
+ size_t bufferlen,
+ const char *entry,
+ const char *after)
+{
+ const char *current_format = NULL;
+
+ current_format = logsys_format_get();
+
+ /* if the entry is already in the format we don't add it again */
+ if (strstr(current_format, entry) != NULL) {
+ return -1;
+ }
+
+ /* if there is no "after", simply prepend the requested entry
+ * otherwise go for beautiful string manipulation.... </sarcasm> */
+ if (!after) {
+ if (snprintf(target_buffer, bufferlen - 1, "%s%s",
+ entry,
+ current_format) >= bufferlen - 1) {
+ return -1;
+ }
+ } else {
+ const char *afterpos;
+ size_t afterlen;
+ size_t templen;
+
+ /* check if after is contained in the format
+ * and afterlen has a meaning or return an error */
+ afterpos = strstr(current_format, after);
+ afterlen = strlen(after);
+ if ((!afterpos) || (!afterlen)) {
+ return -1;
+ }
+
+ templen = afterpos - current_format + afterlen;
+ if (snprintf(target_buffer, templen + 1, "%s", current_format)
+ >= bufferlen - 1) {
+ return -1;
+ }
+ if (snprintf(target_buffer + templen, bufferlen - ( templen + 1 ),
+ "%s%s", entry, current_format + templen)
+ >= bufferlen - ( templen + 1 )) {
+ return -1;
+ }
+ }
+ return 0;
+}
+
+/*
+ * format set is the only global specific option that
+ * doesn't apply at system/subsystem level.
+ */
+static int corosync_main_config_format_set (
+ const char **error_string)
+{
+ const char *error_reason;
+ char new_format_buffer[PATH_MAX];
+ char *value = NULL;
+ int err = 0;
+
+ if (map_get_string("logging.fileline", &value) == CS_OK) {
+ if (strcmp (value, "on") == 0) {
+ if (!insert_into_buffer(new_format_buffer,
+ sizeof(new_format_buffer),
+ " %f:%l", "g]")) {
+ err = logsys_format_set(new_format_buffer);
+ } else
+ if (!insert_into_buffer(new_format_buffer,
+ sizeof(new_format_buffer),
+ "%f:%l", NULL)) {
+ err = logsys_format_set(new_format_buffer);
+ }
+ } else
+ if (strcmp (value, "off") == 0) {
+ /* nothing to do here */
+ } else {
+ error_reason = "unknown value for fileline";
+ goto parse_error;
+ }
+
+ free(value);
+ }
+
+ if (err) {
+ error_reason = "not enough memory to set logging format buffer";
+ goto parse_error;
+ }
+
+ if (map_get_string("logging.function_name", &value) == CS_OK) {
+ if (strcmp (value, "on") == 0) {
+ if (!insert_into_buffer(new_format_buffer,
+ sizeof(new_format_buffer),
+ "%n:", "f:")) {
+ err = logsys_format_set(new_format_buffer);
+ } else
+ if (!insert_into_buffer(new_format_buffer,
+ sizeof(new_format_buffer),
+ " %n", "g]")) {
+ err = logsys_format_set(new_format_buffer);
+ }
+ } else
+ if (strcmp (value, "off") == 0) {
+ /* nothing to do here */
+ } else {
+ error_reason = "unknown value for function_name";
+ goto parse_error;
+ }
+
+ free(value);
+ }
+
+ if (err) {
+ error_reason = "not enough memory to set logging format buffer";
+ goto parse_error;
+ }
+
+ if (map_get_string("logging.timestamp", &value) == CS_OK) {
+ if (strcmp (value, "on") == 0) {
+ if(!insert_into_buffer(new_format_buffer,
+ sizeof(new_format_buffer),
+ "%t ", NULL)) {
+ err = logsys_format_set(new_format_buffer);
+ }
+ } else
+ if (strcmp (value, "off") == 0) {
+ /* nothing to do here */
+ } else {
+ error_reason = "unknown value for timestamp";
+ goto parse_error;
+ }
+
+ free(value);
+ }
+
+ if (err) {
+ error_reason = "not enough memory to set logging format buffer";
+ goto parse_error;
+ }
+
+ return (0);
+
+parse_error:
+ *error_string = error_reason;
+
+ return (-1);
+}
+
+static int corosync_main_config_log_destination_set (
+ const char *path,
+ const char *key,
+ const char *subsys,
+ const char **error_string,
+ unsigned int mode_mask,
+ char deprecated,
+ const char *replacement)
+{
+ static char formatted_error_reason[128];
+ char *value = NULL;
+ unsigned int mode;
+ char key_name[MAP_KEYNAME_MAXLEN];
+
+ snprintf(key_name, MAP_KEYNAME_MAXLEN, "%s.%s", path, key);
+ if (map_get_string(key_name, &value) == CS_OK) {
+ if (deprecated) {
+ log_printf(LOGSYS_LEVEL_WARNING,
+ "Warning: the %s config paramater has been obsoleted."
+ " See corosync.conf man page %s directive.",
+ key, replacement);
+ }
+
+ mode = logsys_config_mode_get (subsys);
+
+ if (strcmp (value, "yes") == 0 || strcmp (value, "on") == 0) {
+ mode |= mode_mask;
+ if (logsys_config_mode_set(subsys, mode) < 0) {
+ sprintf (formatted_error_reason, "unable to set mode %s", key);
+ goto parse_error;
+ }
+ } else
+ if (strcmp (value, "no") == 0 || strcmp (value, "off") == 0) {
+ mode &= ~mode_mask;
+ if (logsys_config_mode_set(subsys, mode) < 0) {
+ sprintf (formatted_error_reason, "unable to unset mode %s", key);
+ goto parse_error;
+ }
+ } else {
+ sprintf (formatted_error_reason, "unknown value for %s", key);
+ goto parse_error;
+ }
+ }
+
+ free(value);
+ return (0);
+
+parse_error:
+ *error_string = formatted_error_reason;
+ free(value);
+ return (-1);
+}
+
+static int corosync_main_config_set (
+ const char *path,
+ const char *subsys,
+ const char **error_string)
+{
+ const char *error_reason = error_string_response;
+ char *value = NULL;
+ int mode;
+ char key_name[MAP_KEYNAME_MAXLEN];
+
+ /*
+ * this bit abuses the internal logsys exported API
+ * to guarantee that all configured subsystems are
+ * initialized too.
+ *
+ * using this approach avoids some headaches caused
+ * by IPC and TOTEM that have a special logging
+ * handling requirements
+ */
+ if (subsys != NULL) {
+ if (_logsys_subsys_create(subsys, NULL) < 0) {
+ error_reason = "unable to create new logging subsystem";
+ goto parse_error;
+ }
+ }
+
+ mode = logsys_config_mode_get(subsys);
+ if (mode < 0) {
+ error_reason = "unable to get mode";
+ goto parse_error;
+ }
+
+ if (corosync_main_config_log_destination_set (path, "to_stderr", subsys, &error_reason,
+ LOGSYS_MODE_OUTPUT_STDERR, 0, NULL) != 0)
+ goto parse_error;
+
+ if (corosync_main_config_log_destination_set (path, "to_syslog", subsys, &error_reason,
+ LOGSYS_MODE_OUTPUT_SYSLOG, 0, NULL) != 0)
+ goto parse_error;
+
+ snprintf(key_name, MAP_KEYNAME_MAXLEN, "%s.%s", path, "syslog_facility");
+ if (map_get_string(key_name, &value) == CS_OK) {
+ int syslog_facility;
+
+ syslog_facility = qb_log_facility2int(value);
+ if (syslog_facility < 0) {
+ error_reason = "unknown syslog facility specified";
+ goto parse_error;
+ }
+ if (logsys_config_syslog_facility_set(subsys,
+ syslog_facility) < 0) {
+ error_reason = "unable to set syslog facility";
+ goto parse_error;
+ }
+
+ free(value);
+ }
+
+ snprintf(key_name, MAP_KEYNAME_MAXLEN, "%s.%s", path, "syslog_level");
+ if (map_get_string(key_name, &value) == CS_OK) {
+ int syslog_priority;
+
+ log_printf(LOGSYS_LEVEL_WARNING,
+ "Warning: the syslog_level config paramater has been obsoleted."
+ " See corosync.conf man page syslog_priority directive.");
+
+ syslog_priority = logsys_priority_id_get(value);
+ if (syslog_priority < 0) {
+ error_reason = "unknown syslog level specified";
+ goto parse_error;
+ }
+ if (logsys_config_syslog_priority_set(subsys,
+ syslog_priority) < 0) {
+ error_reason = "unable to set syslog level";
+ goto parse_error;
+ }
+ free(value);
+ }
+
+ snprintf(key_name, MAP_KEYNAME_MAXLEN, "%s.%s", path, "syslog_priority");
+ if (map_get_string(key_name, &value) == CS_OK) {
+ int syslog_priority;
+
+ syslog_priority = logsys_priority_id_get(value);
+ if (syslog_priority < 0) {
+ error_reason = "unknown syslog priority specified";
+ goto parse_error;
+ }
+ if (logsys_config_syslog_priority_set(subsys,
+ syslog_priority) < 0) {
+ error_reason = "unable to set syslog priority";
+ goto parse_error;
+ }
+ free(value);
+ }
+
+#ifdef LOGCONFIG_USE_ICMAP
+ snprintf(key_name, MAP_KEYNAME_MAXLEN, "%s.%s", path, "logfile");
+ if (map_get_string(key_name, &value) == CS_OK) {
+ if (logsys_config_file_set (subsys, &error_reason, value) < 0) {
+ goto parse_error;
+ }
+ free(value);
+ }
+#else
+ if (!subsys) {
+ if (logsys_config_file_set (subsys, &error_reason, main_logfile) < 0) {
+ goto parse_error;
+ }
+ }
+#endif
+
+ if (corosync_main_config_log_destination_set (path, "to_file", subsys, &error_reason,
+ LOGSYS_MODE_OUTPUT_FILE, 1, "to_logfile") != 0)
+ goto parse_error;
+
+ if (corosync_main_config_log_destination_set (path, "to_logfile", subsys, &error_reason,
+ LOGSYS_MODE_OUTPUT_FILE, 0, NULL) != 0)
+ goto parse_error;
+
+ snprintf(key_name, MAP_KEYNAME_MAXLEN, "%s.%s", path, "logfile_priority");
+ if (map_get_string(key_name, &value) == CS_OK) {
+ int logfile_priority;
+
+ logfile_priority = logsys_priority_id_get(value);
+ if (logfile_priority < 0) {
+ error_reason = "unknown logfile priority specified";
+ goto parse_error;
+ }
+ if (logsys_config_logfile_priority_set(subsys,
+ logfile_priority) < 0) {
+ error_reason = "unable to set logfile priority";
+ goto parse_error;
+ }
+ free(value);
+ }
+
+ snprintf(key_name, MAP_KEYNAME_MAXLEN, "%s.%s", path, "debug");
+ if (map_get_string(key_name, &value) == CS_OK) {
+ if (strcmp (value, "on") == 0) {
+ if (logsys_config_debug_set (subsys, 1) < 0) {
+ error_reason = "unable to set debug on";
+ goto parse_error;
+ }
+ } else
+ if (strcmp (value, "off") == 0) {
+ if (logsys_config_debug_set (subsys, 0) < 0) {
+ error_reason = "unable to set debug off";
+ goto parse_error;
+ }
+ } else {
+ error_reason = "unknown value for debug";
+ goto parse_error;
+ }
+ free(value);
+ }
+
+ return (0);
+
+parse_error:
+ *error_string = error_reason;
+
+ return (-1);
+}
+
+static int corosync_main_config_read_logging (
+ const char **error_string)
+{
+ const char *error_reason;
+#ifdef LOGCONFIG_USE_ICMAP
+ icmap_iter_t iter;
+ const char *key_name;
+#else
+ cmap_iter_handle_t iter;
+ char key_name[CMAP_KEYNAME_MAXLEN];
+#endif
+ char key_subsys[MAP_KEYNAME_MAXLEN];
+ char key_item[MAP_KEYNAME_MAXLEN];
+ int res;
+
+ /* format set is supported only for toplevel */
+ if (corosync_main_config_format_set(&error_reason) < 0) {
+ goto parse_error;
+ }
+
+ if (corosync_main_config_set ("logging", NULL, &error_reason) < 0) {
+ goto parse_error;
+ }
+
+ /*
+ * we will need 2 of these to compensate for new logging
+ * config format
+ */
+#ifdef LOGCONFIG_USE_ICMAP
+ iter = icmap_iter_init("logging.logger_subsys.");
+ while ((key_name = icmap_iter_next(iter, NULL, NULL)) != NULL) {
+#else
+ cmap_iter_init(cmap_handle, "logging.logger_subsys.", &iter);
+ while ((cmap_iter_next(cmap_handle, iter, key_name, NULL, NULL)) == CS_OK) {
+#endif
+ res = sscanf(key_name, "logging.logger_subsys.%[^.].%s", key_subsys, key_item);
+
+ if (res != 2) {
+ continue ;
+ }
+
+ if (strcmp(key_item, "subsys") != 0) {
+ continue ;
+ }
+
+ snprintf(key_item, MAP_KEYNAME_MAXLEN, "logging.logger_subsys.%s", key_subsys);
+
+ if (corosync_main_config_set(key_item, key_subsys, &error_reason) < 0) {
+ goto parse_error;
+ }
+ }
+#ifdef LOGCONFIG_USE_ICMAP
+ icmap_iter_finalize(iter);
+#else
+ cmap_iter_finalize(cmap_handle, iter);
+#endif
+
+ logsys_config_apply();
+ return 0;
+
+parse_error:
+ *error_string = error_reason;
+
+ return (-1);
+}
+
+#ifdef LOGCONFIG_USE_ICMAP
+static void main_logging_notify(
+ int32_t event,
+ const char *key_name,
+ struct icmap_notify_value new_val,
+ struct icmap_notify_value old_val,
+ void *user_data)
+#else
+static void main_logging_notify(
+ cmap_handle_t cmap_handle_unused,
+ cmap_handle_t cmap_track_handle_unused,
+ int32_t event,
+ const char *key_name,
+ struct cmap_notify_value new_val,
+ struct cmap_notify_value old_val,
+ void *user_data)
+#endif
+{
+ const char *error_string;
+
+ /*
+ * Reload the logsys configuration
+ */
+ if (logsys_format_set(NULL) == -1) {
+ fprintf (stderr, "Unable to setup logging format.\n");
+ }
+ corosync_main_config_read_logging(&error_string);
+}
+
+#ifdef LOGCONFIG_USE_ICMAP
+static void add_logsys_config_notification(void)
+{
+ icmap_track_t icmap_track = NULL;
+
+ icmap_track_add("logging.",
+ ICMAP_TRACK_ADD | ICMAP_TRACK_DELETE | ICMAP_TRACK_MODIFY | ICMAP_TRACK_PREFIX,
+ main_logging_notify,
+ NULL,
+ &icmap_track);
+}
+#else
+static void add_logsys_config_notification(void)
+{
+ cmap_track_handle_t cmap_track;
+
+ cmap_track_add(cmap_handle, "logging.",
+ CMAP_TRACK_ADD | CMAP_TRACK_DELETE | CMAP_TRACK_MODIFY | CMAP_TRACK_PREFIX,
+ main_logging_notify,
+ NULL,
+ &cmap_track);
+}
+#endif
+
+int corosync_log_config_read (
+#ifndef LOGCONFIG_USE_ICMAP
+ cmap_handle_t cmap_h,
+ const char *default_logfile,
+#endif
+ const char **error_string)
+{
+ const char *error_reason = error_string_response;
+
+#ifndef LOGCONFIG_USE_ICMAP
+ if (!cmap_h) {
+ error_reason = "No cmap handle";
+ return (-1);
+ }
+ if (!default_logfile) {
+ error_reason = "No default logfile";
+ return (-1);
+ }
+ cmap_handle = cmap_h;
+ main_logfile = default_logfile;
+#endif
+
+ if (corosync_main_config_read_logging(error_string) < 0) {
+ error_reason = *error_string;
+ goto parse_error;
+ }
+
+ add_logsys_config_notification();
+
+ return 0;
+
+parse_error:
+ snprintf (error_string_response, sizeof(error_string_response),
+ "parse error in config: %s.\n",
+ error_reason);
+
+ *error_string = error_string_response;
+ return (-1);
+}
diff --git a/exec/logconfig.h b/exec/logconfig.h
new file mode 100644
index 0000000..b49aaea
--- /dev/null
+++ b/exec/logconfig.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2002-2005 MontaVista Software, Inc.
+ * Copyright (c) 2006-2012 Red Hat, Inc.
+ *
+ * All rights reserved.
+ *
+ * Author: Steven Dake (sdake@xxxxxxxxxx)
+ *
+ * This software licensed under BSD license, the text of which follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * - Neither the name of the MontaVista Software, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef LOGCONFIG_H_DEFINED
+#define LOGCONFIG_H_DEFINED
+
+#include <corosync/logsys.h>
+#include <corosync/list.h>
+#include <corosync/coroapi.h>
+#include <corosync/cmap.h>
+
+/**
+ * All service handlers
+ */
+struct dynamic_service {
+ char *name;
+ unsigned int ver;
+ unsigned int handle;
+};
+#define MAX_DYNAMIC_SERVICES 128
+
+#ifdef LOGCONFIG_USE_ICMAP
+extern int corosync_log_config_read (
+ const char **error_string);
+#else
+extern int corosync_log_config_read (
+ cmap_handle_t cmap_h,
+ const char *default_logfile,
+ const char **error_string);
+#endif
+
+#endif /* LOGCONFIG_H_DEFINED */
diff --git a/exec/main.c b/exec/main.c
index a125bbd..46fab92 100644
--- a/exec/main.c
+++ b/exec/main.c
@@ -111,7 +111,7 @@
#include "quorum.h"
#include "totemsrp.h"
-#include "mainconfig.h"
+#include "logconfig.h"
#include "totemconfig.h"
#include "main.h"
#include "sync.h"
@@ -1080,7 +1080,7 @@ int main (int argc, char **argv, char **envp)
corosync_exit_error (COROSYNC_DONE_MAINCONFIGREAD);
}
- res = corosync_main_config_read (&error_string);
+ res = corosync_log_config_read (&error_string);
if (res == -1) {
/*
* if we are here, we _must_ flush the logsys queue
@@ -1092,7 +1092,7 @@ int main (int argc, char **argv, char **envp)
log_printf (LOGSYS_LEVEL_ERROR, "%s", error_string);
fprintf(stderr, "%s", error_string);
syslog (LOGSYS_LEVEL_ERROR, "%s", error_string);
- corosync_exit_error (COROSYNC_DONE_MAINCONFIGREAD);
+ corosync_exit_error (COROSYNC_DONE_LOGCONFIGREAD);
}
/*
diff --git a/exec/mainconfig.c b/exec/mainconfig.c
deleted file mode 100644
index 9ebd9c3..0000000
--- a/exec/mainconfig.c
+++ /dev/null
@@ -1,603 +0,0 @@
-/*
- * Copyright (c) 2002-2005 MontaVista Software, Inc.
- * Copyright (c) 2006-2011 Red Hat, Inc.
- *
- * All rights reserved.
- *
- * Author: Steven Dake (sdake@xxxxxxxxxx)
- * Jan Friesse (jfriesse@xxxxxxxxxx)
- *
- * This software licensed under BSD license, the text of which follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * - Neither the name of the MontaVista Software, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#include <corosync/totem/totem.h>
-#include <corosync/logsys.h>
-#ifdef MAINCONFIG_USE_ICMAP
-#include <corosync/icmap.h>
-#define MAP_KEYNAME_MAXLEN ICMAP_KEYNAME_MAXLEN
-#define map_get_string(key_name, value) icmap_get_string(key_name, value)
-#else
-#include <corosync/cmap.h>
-static cmap_handle_t cmap_handle;
-static const char *main_logfile;
-#define MAP_KEYNAME_MAXLEN CMAP_KEYNAME_MAXLEN
-#define map_get_string(key_name, value) cmap_get_string(cmap_handle, key_name, value)
-#endif
-
-#include "util.h"
-#include "mainconfig.h"
-
-static char error_string_response[512];
-
-/**
- * insert_into_buffer
- * @target_buffer: a buffer where to write results
- * @bufferlen: tell us the size of the buffer to avoid overflows
- * @entry: entry that needs to be added to the buffer
- * @after: can either be NULL or set to a string.
- * if NULL, @entry is prependend to logsys_format_get buffer.
- * if set, @entry is added immediately after @after.
- *
- * Since the function is specific to logsys_format_get handling, it is implicit
- * that source is logsys_format_get();
- *
- * In case of failure, target_buffer could be left dirty. So don't trust
- * any data leftover in it.
- *
- * Searching for "after" assumes that there is only entry of "after"
- * in the source. Afterall we control the string here and for logging format
- * it makes little to no sense to have duplicate format entries.
- *
- * Returns: 0 on success, -1 on failure
- **/
-static int insert_into_buffer(
- char *target_buffer,
- size_t bufferlen,
- const char *entry,
- const char *after)
-{
- const char *current_format = NULL;
-
- current_format = logsys_format_get();
-
- /* if the entry is already in the format we don't add it again */
- if (strstr(current_format, entry) != NULL) {
- return -1;
- }
-
- /* if there is no "after", simply prepend the requested entry
- * otherwise go for beautiful string manipulation.... </sarcasm> */
- if (!after) {
- if (snprintf(target_buffer, bufferlen - 1, "%s%s",
- entry,
- current_format) >= bufferlen - 1) {
- return -1;
- }
- } else {
- const char *afterpos;
- size_t afterlen;
- size_t templen;
-
- /* check if after is contained in the format
- * and afterlen has a meaning or return an error */
- afterpos = strstr(current_format, after);
- afterlen = strlen(after);
- if ((!afterpos) || (!afterlen)) {
- return -1;
- }
-
- templen = afterpos - current_format + afterlen;
- if (snprintf(target_buffer, templen + 1, "%s", current_format)
- >= bufferlen - 1) {
- return -1;
- }
- if (snprintf(target_buffer + templen, bufferlen - ( templen + 1 ),
- "%s%s", entry, current_format + templen)
- >= bufferlen - ( templen + 1 )) {
- return -1;
- }
- }
- return 0;
-}
-
-/*
- * format set is the only global specific option that
- * doesn't apply at system/subsystem level.
- */
-static int corosync_main_config_format_set (
- const char **error_string)
-{
- const char *error_reason;
- char new_format_buffer[PATH_MAX];
- char *value = NULL;
- int err = 0;
-
- if (map_get_string("logging.fileline", &value) == CS_OK) {
- if (strcmp (value, "on") == 0) {
- if (!insert_into_buffer(new_format_buffer,
- sizeof(new_format_buffer),
- " %f:%l", "g]")) {
- err = logsys_format_set(new_format_buffer);
- } else
- if (!insert_into_buffer(new_format_buffer,
- sizeof(new_format_buffer),
- "%f:%l", NULL)) {
- err = logsys_format_set(new_format_buffer);
- }
- } else
- if (strcmp (value, "off") == 0) {
- /* nothing to do here */
- } else {
- error_reason = "unknown value for fileline";
- goto parse_error;
- }
-
- free(value);
- }
-
- if (err) {
- error_reason = "not enough memory to set logging format buffer";
- goto parse_error;
- }
-
- if (map_get_string("logging.function_name", &value) == CS_OK) {
- if (strcmp (value, "on") == 0) {
- if (!insert_into_buffer(new_format_buffer,
- sizeof(new_format_buffer),
- "%n:", "f:")) {
- err = logsys_format_set(new_format_buffer);
- } else
- if (!insert_into_buffer(new_format_buffer,
- sizeof(new_format_buffer),
- " %n", "g]")) {
- err = logsys_format_set(new_format_buffer);
- }
- } else
- if (strcmp (value, "off") == 0) {
- /* nothing to do here */
- } else {
- error_reason = "unknown value for function_name";
- goto parse_error;
- }
-
- free(value);
- }
-
- if (err) {
- error_reason = "not enough memory to set logging format buffer";
- goto parse_error;
- }
-
- if (map_get_string("logging.timestamp", &value) == CS_OK) {
- if (strcmp (value, "on") == 0) {
- if(!insert_into_buffer(new_format_buffer,
- sizeof(new_format_buffer),
- "%t ", NULL)) {
- err = logsys_format_set(new_format_buffer);
- }
- } else
- if (strcmp (value, "off") == 0) {
- /* nothing to do here */
- } else {
- error_reason = "unknown value for timestamp";
- goto parse_error;
- }
-
- free(value);
- }
-
- if (err) {
- error_reason = "not enough memory to set logging format buffer";
- goto parse_error;
- }
-
- return (0);
-
-parse_error:
- *error_string = error_reason;
-
- return (-1);
-}
-
-static int corosync_main_config_log_destination_set (
- const char *path,
- const char *key,
- const char *subsys,
- const char **error_string,
- unsigned int mode_mask,
- char deprecated,
- const char *replacement)
-{
- static char formatted_error_reason[128];
- char *value = NULL;
- unsigned int mode;
- char key_name[MAP_KEYNAME_MAXLEN];
-
- snprintf(key_name, MAP_KEYNAME_MAXLEN, "%s.%s", path, key);
- if (map_get_string(key_name, &value) == CS_OK) {
- if (deprecated) {
- log_printf(LOGSYS_LEVEL_WARNING,
- "Warning: the %s config paramater has been obsoleted."
- " See corosync.conf man page %s directive.",
- key, replacement);
- }
-
- mode = logsys_config_mode_get (subsys);
-
- if (strcmp (value, "yes") == 0 || strcmp (value, "on") == 0) {
- mode |= mode_mask;
- if (logsys_config_mode_set(subsys, mode) < 0) {
- sprintf (formatted_error_reason, "unable to set mode %s", key);
- goto parse_error;
- }
- } else
- if (strcmp (value, "no") == 0 || strcmp (value, "off") == 0) {
- mode &= ~mode_mask;
- if (logsys_config_mode_set(subsys, mode) < 0) {
- sprintf (formatted_error_reason, "unable to unset mode %s", key);
- goto parse_error;
- }
- } else {
- sprintf (formatted_error_reason, "unknown value for %s", key);
- goto parse_error;
- }
- }
-
- free(value);
- return (0);
-
-parse_error:
- *error_string = formatted_error_reason;
- free(value);
- return (-1);
-}
-
-static int corosync_main_config_set (
- const char *path,
- const char *subsys,
- const char **error_string)
-{
- const char *error_reason = error_string_response;
- char *value = NULL;
- int mode;
- char key_name[MAP_KEYNAME_MAXLEN];
-
- /*
- * this bit abuses the internal logsys exported API
- * to guarantee that all configured subsystems are
- * initialized too.
- *
- * using this approach avoids some headaches caused
- * by IPC and TOTEM that have a special logging
- * handling requirements
- */
- if (subsys != NULL) {
- if (_logsys_subsys_create(subsys, NULL) < 0) {
- error_reason = "unable to create new logging subsystem";
- goto parse_error;
- }
- }
-
- mode = logsys_config_mode_get(subsys);
- if (mode < 0) {
- error_reason = "unable to get mode";
- goto parse_error;
- }
-
- if (corosync_main_config_log_destination_set (path, "to_stderr", subsys, &error_reason,
- LOGSYS_MODE_OUTPUT_STDERR, 0, NULL) != 0)
- goto parse_error;
-
- if (corosync_main_config_log_destination_set (path, "to_syslog", subsys, &error_reason,
- LOGSYS_MODE_OUTPUT_SYSLOG, 0, NULL) != 0)
- goto parse_error;
-
- snprintf(key_name, MAP_KEYNAME_MAXLEN, "%s.%s", path, "syslog_facility");
- if (map_get_string(key_name, &value) == CS_OK) {
- int syslog_facility;
-
- syslog_facility = qb_log_facility2int(value);
- if (syslog_facility < 0) {
- error_reason = "unknown syslog facility specified";
- goto parse_error;
- }
- if (logsys_config_syslog_facility_set(subsys,
- syslog_facility) < 0) {
- error_reason = "unable to set syslog facility";
- goto parse_error;
- }
-
- free(value);
- }
-
- snprintf(key_name, MAP_KEYNAME_MAXLEN, "%s.%s", path, "syslog_level");
- if (map_get_string(key_name, &value) == CS_OK) {
- int syslog_priority;
-
- log_printf(LOGSYS_LEVEL_WARNING,
- "Warning: the syslog_level config paramater has been obsoleted."
- " See corosync.conf man page syslog_priority directive.");
-
- syslog_priority = logsys_priority_id_get(value);
- if (syslog_priority < 0) {
- error_reason = "unknown syslog level specified";
- goto parse_error;
- }
- if (logsys_config_syslog_priority_set(subsys,
- syslog_priority) < 0) {
- error_reason = "unable to set syslog level";
- goto parse_error;
- }
- free(value);
- }
-
- snprintf(key_name, MAP_KEYNAME_MAXLEN, "%s.%s", path, "syslog_priority");
- if (map_get_string(key_name, &value) == CS_OK) {
- int syslog_priority;
-
- syslog_priority = logsys_priority_id_get(value);
- if (syslog_priority < 0) {
- error_reason = "unknown syslog priority specified";
- goto parse_error;
- }
- if (logsys_config_syslog_priority_set(subsys,
- syslog_priority) < 0) {
- error_reason = "unable to set syslog priority";
- goto parse_error;
- }
- free(value);
- }
-
-#ifdef MAINCONFIG_USE_ICMAP
- snprintf(key_name, MAP_KEYNAME_MAXLEN, "%s.%s", path, "logfile");
- if (map_get_string(key_name, &value) == CS_OK) {
- if (logsys_config_file_set (subsys, &error_reason, value) < 0) {
- goto parse_error;
- }
- free(value);
- }
-#else
- if (!subsys) {
- if (logsys_config_file_set (subsys, &error_reason, main_logfile) < 0) {
- goto parse_error;
- }
- }
-#endif
-
- if (corosync_main_config_log_destination_set (path, "to_file", subsys, &error_reason,
- LOGSYS_MODE_OUTPUT_FILE, 1, "to_logfile") != 0)
- goto parse_error;
-
- if (corosync_main_config_log_destination_set (path, "to_logfile", subsys, &error_reason,
- LOGSYS_MODE_OUTPUT_FILE, 0, NULL) != 0)
- goto parse_error;
-
- snprintf(key_name, MAP_KEYNAME_MAXLEN, "%s.%s", path, "logfile_priority");
- if (map_get_string(key_name, &value) == CS_OK) {
- int logfile_priority;
-
- logfile_priority = logsys_priority_id_get(value);
- if (logfile_priority < 0) {
- error_reason = "unknown logfile priority specified";
- goto parse_error;
- }
- if (logsys_config_logfile_priority_set(subsys,
- logfile_priority) < 0) {
- error_reason = "unable to set logfile priority";
- goto parse_error;
- }
- free(value);
- }
-
- snprintf(key_name, MAP_KEYNAME_MAXLEN, "%s.%s", path, "debug");
- if (map_get_string(key_name, &value) == CS_OK) {
- if (strcmp (value, "on") == 0) {
- if (logsys_config_debug_set (subsys, 1) < 0) {
- error_reason = "unable to set debug on";
- goto parse_error;
- }
- } else
- if (strcmp (value, "off") == 0) {
- if (logsys_config_debug_set (subsys, 0) < 0) {
- error_reason = "unable to set debug off";
- goto parse_error;
- }
- } else {
- error_reason = "unknown value for debug";
- goto parse_error;
- }
- free(value);
- }
-
- return (0);
-
-parse_error:
- *error_string = error_reason;
-
- return (-1);
-}
-
-static int corosync_main_config_read_logging (
- const char **error_string)
-{
- const char *error_reason;
-#ifdef MAINCONFIG_USE_ICMAP
- icmap_iter_t iter;
- const char *key_name;
-#else
- cmap_iter_handle_t iter;
- char key_name[CMAP_KEYNAME_MAXLEN];
-#endif
- char key_subsys[MAP_KEYNAME_MAXLEN];
- char key_item[MAP_KEYNAME_MAXLEN];
- int res;
-
- /* format set is supported only for toplevel */
- if (corosync_main_config_format_set(&error_reason) < 0) {
- goto parse_error;
- }
-
- if (corosync_main_config_set ("logging", NULL, &error_reason) < 0) {
- goto parse_error;
- }
-
- /*
- * we will need 2 of these to compensate for new logging
- * config format
- */
-#ifdef MAINCONFIG_USE_ICMAP
- iter = icmap_iter_init("logging.logger_subsys.");
- while ((key_name = icmap_iter_next(iter, NULL, NULL)) != NULL) {
-#else
- cmap_iter_init(cmap_handle, "logging.logger_subsys.", &iter);
- while ((cmap_iter_next(cmap_handle, iter, key_name, NULL, NULL)) == CS_OK) {
-#endif
- res = sscanf(key_name, "logging.logger_subsys.%[^.].%s", key_subsys, key_item);
-
- if (res != 2) {
- continue ;
- }
-
- if (strcmp(key_item, "subsys") != 0) {
- continue ;
- }
-
- snprintf(key_item, MAP_KEYNAME_MAXLEN, "logging.logger_subsys.%s", key_subsys);
-
- if (corosync_main_config_set(key_item, key_subsys, &error_reason) < 0) {
- goto parse_error;
- }
- }
-#ifdef MAINCONFIG_USE_ICMAP
- icmap_iter_finalize(iter);
-#else
- cmap_iter_finalize(cmap_handle, iter);
-#endif
-
- logsys_config_apply();
- return 0;
-
-parse_error:
- *error_string = error_reason;
-
- return (-1);
-}
-
-#ifdef MAINCONFIG_USE_ICMAP
-static void main_logging_notify(
- int32_t event,
- const char *key_name,
- struct icmap_notify_value new_val,
- struct icmap_notify_value old_val,
- void *user_data)
-#else
-static void main_logging_notify(
- cmap_handle_t cmap_handle_unused,
- cmap_handle_t cmap_track_handle_unused,
- int32_t event,
- const char *key_name,
- struct cmap_notify_value new_val,
- struct cmap_notify_value old_val,
- void *user_data)
-#endif
-{
- const char *error_string;
-
- /*
- * Reload the logsys configuration
- */
- if (logsys_format_set(NULL) == -1) {
- fprintf (stderr, "Unable to setup logging format.\n");
- }
- corosync_main_config_read_logging(&error_string);
-}
-
-#ifdef MAINCONFIG_USE_ICMAP
-static void add_logsys_config_notification(void)
-{
- icmap_track_t icmap_track = NULL;
-
- icmap_track_add("logging.",
- ICMAP_TRACK_ADD | ICMAP_TRACK_DELETE | ICMAP_TRACK_MODIFY | ICMAP_TRACK_PREFIX,
- main_logging_notify,
- NULL,
- &icmap_track);
-}
-#else
-static void add_logsys_config_notification(void)
-{
- cmap_track_handle_t cmap_track;
-
- cmap_track_add(cmap_handle, "logging.",
- CMAP_TRACK_ADD | CMAP_TRACK_DELETE | CMAP_TRACK_MODIFY | CMAP_TRACK_PREFIX,
- main_logging_notify,
- NULL,
- &cmap_track);
-}
-#endif
-
-int corosync_main_config_read (
-#ifndef MAINCONFIG_USE_ICMAP
- cmap_handle_t cmap_h,
- const char *default_logfile,
-#endif
- const char **error_string)
-{
- const char *error_reason = error_string_response;
-
-#ifndef MAINCONFIG_USE_ICMAP
- if (!cmap_h) {
- error_reason = "No cmap handle";
- return (-1);
- }
- if (!default_logfile) {
- error_reason = "No default logfile";
- return (-1);
- }
- cmap_handle = cmap_h;
- main_logfile = default_logfile;
-#endif
-
- if (corosync_main_config_read_logging(error_string) < 0) {
- error_reason = *error_string;
- goto parse_error;
- }
-
- add_logsys_config_notification();
-
- return 0;
-
-parse_error:
- snprintf (error_string_response, sizeof(error_string_response),
- "parse error in config: %s.\n",
- error_reason);
-
- *error_string = error_string_response;
- return (-1);
-}
diff --git a/exec/mainconfig.h b/exec/mainconfig.h
deleted file mode 100644
index 30976d4..0000000
--- a/exec/mainconfig.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2002-2005 MontaVista Software, Inc.
- * Copyright (c) 2006-2012 Red Hat, Inc.
- *
- * All rights reserved.
- *
- * Author: Steven Dake (sdake@xxxxxxxxxx)
- *
- * This software licensed under BSD license, the text of which follows:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * - Neither the name of the MontaVista Software, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef MAINCONFIG_H_DEFINED
-#define MAINCONFIG_H_DEFINED
-
-#include <corosync/logsys.h>
-#include <corosync/list.h>
-#include <corosync/coroapi.h>
-#include <corosync/cmap.h>
-
-/**
- * All service handlers
- */
-struct dynamic_service {
- char *name;
- unsigned int ver;
- unsigned int handle;
-};
-#define MAX_DYNAMIC_SERVICES 128
-
-#ifdef MAINCONFIG_USE_ICMAP
-extern int corosync_main_config_read (
- const char **error_string);
-#else
-extern int corosync_main_config_read (
- cmap_handle_t cmap_h,
- const char *default_logfile,
- const char **error_string);
-#endif
-
-#endif /* MAINCONFIG_H_DEFINED */
diff --git a/exec/service.c b/exec/service.c
index c8adae7..effe4b2 100644
--- a/exec/service.c
+++ b/exec/service.c
@@ -42,7 +42,6 @@
#include <corosync/totem/totem.h>
#include <corosync/corotypes.h>
-#include "mainconfig.h"
#include "util.h"
#include <corosync/logsys.h>
#include <corosync/icmap.h>
diff --git a/exec/util.h b/exec/util.h
index faf038f..58f804b 100644
--- a/exec/util.h
+++ b/exec/util.h
@@ -47,6 +47,7 @@ extern cs_time_t clust_time_now(void);
enum e_corosync_done {
COROSYNC_DONE_EXIT = 0,
COROSYNC_DONE_FORK = 4,
+ COROSYNC_DONE_LOGCONFIGREAD = 7,
COROSYNC_DONE_MAINCONFIGREAD = 8,
COROSYNC_DONE_LOGSETUP = 9,
COROSYNC_DONE_ICMAP = 12,
--
1.7.7.6
_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss
