qdevice: Import log instead of qdevice-log

and move qdevice-log-debug to log-common to share it with qnetd.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>

diff --git a/qdevices/Makefile.am b/qdevices/Makefile.am
index d51edf6e7550618fb5798d7cf183d22806437164..806703d1fa6c8d3bd092f2c93bf57f702288a07b 100644 (file)
--- a/qdevices/Makefile.am
+++ b/qdevices/Makefile.am
@@ -96,7 +96,7 @@ corosync_qdevice_SOURCES = corosync-qdevice.c \
                            qdevice-cmap.c qdevice-cmap.h \
                            qdevice-instance.c qdevice-instance.h node-list.c node-list.h \
                            utils.c utils.h qdevice-log.c qdevice-log.h \
-                           qdevice-log-debug.c qdevice-log-debug.h \
+                           log-common.c log-common.h \
                            qdevice-votequorum.c qdevice-votequorum.h \
                            qdevice-model.c qdevice-model.h qdevice-model-net.c qdevice-model-net.h \
                            qdevice-net-instance.c qdevice-net-instance.h dynar.c dynar.h \

diff --git a/qdevices/corosync-qdevice.c b/qdevices/corosync-qdevice.c
index b8165130f1c8ca2b52b9c4c66f50b9ce4ddf1eda..4ea77c99adf4b0715ef8231cbddfd62aa4bf2db7 100644 (file)
--- a/qdevices/corosync-qdevice.c
+++ b/qdevices/corosync-qdevice.c
@@ -39,6 +39,7 @@
 #include "dynar.h"
 #include "dynar-str.h"
 #include "dynar-getopt-lex.h"
+#include "log.h"
 #include "qdevice-advanced-settings.h"
 #include "qdevice-config.h"
 #include "qdevice-cmap.h"

diff --git a/qdevices/log-common.c b/qdevices/log-common.c
new file mode 100644 (file)
index 0000000..a4cb593
--- /dev/null
+++ b/qdevices/log-common.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2015-2019 Red Hat, Inc.
+ *
+ * All rights reserved.
+ *
+ * Author: Jan Friesse (jfriesse@redhat.com)
+ *
+ * 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 Red Hat, 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 "log.h"
+#include "log-common.h"
+#include "utils.h"
+
+void
+log_common_debug_dump_node_list(const struct node_list *nlist)
+{
+       struct node_list_entry *node_info;
+       size_t zi;
+
+       log(LOG_DEBUG, "  Node list:");
+
+       zi = 0;
+
+       TAILQ_FOREACH(node_info, nlist, entries) {
+               log(LOG_DEBUG, "    %zu node_id = "UTILS_PRI_NODE_ID", "
+                   "data_center_id = "UTILS_PRI_DATACENTER_ID", node_state = %s",
+                   zi, node_info->node_id, node_info->data_center_id,
+                   tlv_node_state_to_str(node_info->node_state));
+               zi++;
+       }
+}

diff --git a/qdevices/log-common.h b/qdevices/log-common.h
new file mode 100644 (file)
index 0000000..8ccfa93
--- /dev/null
+++ b/qdevices/log-common.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2015-2019 Red Hat, Inc.
+ *
+ * All rights reserved.
+ *
+ * Author: Jan Friesse (jfriesse@redhat.com)
+ *
+ * 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 Red Hat, 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 _LOG_COMMON_H_
+#define _LOG_COMMON_H_
+
+#include "node-list.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void            log_common_debug_dump_node_list(const struct node_list *nlist);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _LOG_COMMON_H_ */

diff --git a/qdevices/log.c b/qdevices/log.c
index e08790e6b8ca3f8356ee049734a17a34d1eb5be3..29847c9194ba2d79a1d9397e62b8f9f2d06e7636 100644 (file)
--- a/qdevices/log.c
+++ b/qdevices/log.c
@@ -37,7 +37,6 @@
 #include <string.h>
 #include <time.h>
 
-#include "qnet-config.h"
 #include "log.h"
 
 static int log_config_target = 0;

diff --git a/qdevices/qdevice-cmap.c b/qdevices/qdevice-cmap.c
index 9004b05c82875c92129ddb4f8e71feb8044bde47..9a1e2adc4cda7d09af3443d6efa04a4b403d602d 100644 (file)
--- a/qdevices/qdevice-cmap.c
+++ b/qdevices/qdevice-cmap.c
@@ -41,10 +41,11 @@
 #include <stdint.h>
 #include <netdb.h>
 
+#include "log.h"
 #include "qdevice-config.h"
 #include "qdevice-cmap.h"
 #include "qdevice-log.h"
-#include "qdevice-log-debug.h"
+#include "log-common.h"
 #include "qdevice-model.h"
 #include "utils.h"
 
@@ -263,7 +264,7 @@ qdevice_cmap_node_list_event(struct qdevice_instance *instance)
        if (config_version_set) {
                log(LOG_DEBUG, "  config_version = "UTILS_PRI_CONFIG_VERSION, config_version);
        }
-       qdevice_log_debug_dump_node_list(&nlist);
+       log_common_debug_dump_node_list(&nlist);
 
        if (qdevice_model_config_node_list_changed(instance, &nlist,
            config_version_set, config_version) != 0) {

diff --git a/qdevices/qdevice-heuristics-cmd.c b/qdevices/qdevice-heuristics-cmd.c
index 9df91b2072bd99b62a7cb8ac03a4ebe9c2304b24..49996ed718384675e46b0407e7971cfaa8137b16 100644 (file)
--- a/qdevices/qdevice-heuristics-cmd.c
+++ b/qdevices/qdevice-heuristics-cmd.c
@@ -34,14 +34,15 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "dynar.h"
 #include "dynar-str.h"
+#include "log.h"
 #include "qdevice-heuristics-exec-result.h"
 #include "qdevice-heuristics-cmd.h"
 #include "qdevice-heuristics-cmd-str.h"
 #include "qdevice-heuristics-io.h"
-#include "qdevice-log.h"
 
 static int
 qdevice_heuristics_cmd_process_exec_result(struct qdevice_heuristics_instance *instance,

diff --git a/qdevices/qdevice-heuristics-log.c b/qdevices/qdevice-heuristics-log.c
index d176c5ecc6da55a8c85c5739835bbdba36a1d9d4..bf6bcff6bf86a6a494a8281ec271dbd1321c761d 100644 (file)
--- a/qdevices/qdevice-heuristics-log.c
+++ b/qdevices/qdevice-heuristics-log.c
@@ -32,9 +32,11 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <string.h>
+
+#include "log.h"
 #include "qdevice-heuristics-io.h"
 #include "qdevice-heuristics-log.h"
-#include "qdevice-log.h"
 
 /*
  * 1 - Line logged

diff --git a/qdevices/qdevice-heuristics.c b/qdevices/qdevice-heuristics.c
index f632992b5c42634636e0e6b1291a754564c5a7ec..e98f935883b1f9b6fb2c3c13b841d05d0604e098 100644 (file)
--- a/qdevices/qdevice-heuristics.c
+++ b/qdevices/qdevice-heuristics.c
@@ -41,7 +41,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "qdevice-log.h"
+#include "log.h"
 #include "qdevice-heuristics.h"
 #include "qdevice-heuristics-cmd.h"
 #include "qdevice-heuristics-worker.h"

diff --git a/qdevices/qdevice-instance.c b/qdevices/qdevice-instance.c
index 2092507ba39206c697476449c0682819c47e81bc..4fe42de32f0fa4de6767c02eb94813ec6da5cf51 100644 (file)
--- a/qdevices/qdevice-instance.c
+++ b/qdevices/qdevice-instance.c
@@ -35,10 +35,10 @@
 #include <string.h>
 #include <stdio.h>
 
+#include "log.h"
 #include "qdevice-config.h"
 #include "qdevice-instance.h"
 #include "qdevice-heuristics-exec-list.h"
-#include "qdevice-log.h"
 #include "qdevice-model.h"
 #include "utils.h"
 

diff --git a/qdevices/qdevice-ipc-cmd.c b/qdevices/qdevice-ipc-cmd.c
index a04adb5e593928b894590254e6ffec311598c60a..09ce2d493e43323e80a19f7c3d4f7afacfc4b5c1 100644 (file)
--- a/qdevices/qdevice-ipc-cmd.c
+++ b/qdevices/qdevice-ipc-cmd.c
@@ -32,8 +32,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "log.h"
 #include "qdevice-ipc-cmd.h"
-#include "qdevice-log.h"
 #include "qdevice-model.h"
 #include "dynar-str.h"
 #include "utils.h"

diff --git a/qdevices/qdevice-ipc.c b/qdevices/qdevice-ipc.c
index 3d5ba9c8958137cb6eb0272d85b990a6c2c9841f..a7451b6cfe74b6aa872f37530babe07f92c62325 100644 (file)
--- a/qdevices/qdevice-ipc.c
+++ b/qdevices/qdevice-ipc.c
@@ -32,9 +32,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "log.h"
 #include "qdevice-config.h"
 #include "qdevice-ipc.h"
-#include "qdevice-log.h"
 #include "unix-socket-ipc.h"
 #include "dynar-simple-lex.h"
 #include "dynar-str.h"

diff --git a/qdevices/qdevice-log-debug.c b/qdevices/qdevice-log-debug.c
deleted file mode 100644 (file)
index 99dc833..0000000
--- a/qdevices/qdevice-log-debug.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2015-2019 Red Hat, Inc.
- *
- * All rights reserved.
- *
- * Author: Jan Friesse (jfriesse@redhat.com)
- *
- * 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 Red Hat, 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 "qdevice-log-debug.h"
-#include "qdevice-log.h"
-#include "utils.h"
-
-void
-qdevice_log_debug_dump_node_list(const struct node_list *nlist)
-{
-       struct node_list_entry *node_info;
-       size_t zi;
-
-       log(LOG_DEBUG, "  Node list:");
-
-       zi = 0;
-
-       TAILQ_FOREACH(node_info, nlist, entries) {
-               log(LOG_DEBUG, "    %zu node_id = "UTILS_PRI_NODE_ID", "
-                   "data_center_id = "UTILS_PRI_DATACENTER_ID", node_state = %s",
-                   zi, node_info->node_id, node_info->data_center_id,
-                   tlv_node_state_to_str(node_info->node_state));
-               zi++;
-       }
-}

diff --git a/qdevices/qdevice-log-debug.h b/qdevices/qdevice-log-debug.h
deleted file mode 100644 (file)
index 23469ba..0000000
--- a/qdevices/qdevice-log-debug.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2015-2016 Red Hat, Inc.
- *
- * All rights reserved.
- *
- * Author: Jan Friesse (jfriesse@redhat.com)
- *
- * 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 Red Hat, 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 _QDEVICE_LOG_DEBUG_H_
-#define _QDEVICE_LOG_DEBUG_H_
-
-#include "node-list.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void            qdevice_log_debug_dump_node_list(const struct node_list *nlist);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _QDEVICE_LOG_DEBUG_H_ */

diff --git a/qdevices/qdevice-model-net.c b/qdevices/qdevice-model-net.c
index ca16ec7c3e599a4ffb4cd730aeb419345032154c..98347c8d5efc8c5bcd3d9e21da67b81fbee7829a 100644 (file)
--- a/qdevices/qdevice-model-net.c
+++ b/qdevices/qdevice-model-net.c
@@ -34,9 +34,9 @@
 
 #include <poll.h>
 
+#include "log.h"
 #include "qdevice-model.h"
 #include "qdevice-model-net.h"
-#include "qdevice-log.h"
 #include "qdevice-net-cast-vote-timer.h"
 #include "qdevice-net-instance.h"
 #include "qdevice-net-ipc-cmd.h"

diff --git a/qdevices/qdevice-model.c b/qdevices/qdevice-model.c
index 5b58695003e2d1606d58340af6b6093082b2bf31..2cc6725c541f3023e87b7c25bb43c36d2bc5a238 100644 (file)
--- a/qdevices/qdevice-model.c
+++ b/qdevices/qdevice-model.c
@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "qdevice-log.h"
+#include "log.h"
 #include "qdevice-model.h"
 #include "qdevice-model-net.h"
 

diff --git a/qdevices/qdevice-net-algo-2nodelms.c b/qdevices/qdevice-net-algo-2nodelms.c
index e64a702d4fb757f3d2316e871e73ef37a82cd055..f13fc2db7222ca1f5f04676cc1f8d36c688f1305 100644 (file)
--- a/qdevices/qdevice-net-algo-2nodelms.c
+++ b/qdevices/qdevice-net-algo-2nodelms.c
@@ -36,8 +36,8 @@
 
 #include <string.h>
 
+#include "log.h"
 #include "qdevice-net-algo-2nodelms.h"
-#include "qdevice-log.h"
 #include "qdevice-net-send.h"
 #include "qdevice-net-cast-vote-timer.h"
 

diff --git a/qdevices/qdevice-net-algo-ffsplit.c b/qdevices/qdevice-net-algo-ffsplit.c
index 83a16743e070939f9cfd1d8de0463d80d2a93a08..9ed690a5bba4ca58c5f4410b40e597954ade1a71 100644 (file)
--- a/qdevices/qdevice-net-algo-ffsplit.c
+++ b/qdevices/qdevice-net-algo-ffsplit.c
@@ -36,8 +36,8 @@
 
 #include <string.h>
 
+#include "log.h"
 #include "qdevice-net-algo-ffsplit.h"
-#include "qdevice-log.h"
 #include "qdevice-net-send.h"
 #include "qdevice-net-cast-vote-timer.h"
 #include "qdevice-votequorum.h"

diff --git a/qdevices/qdevice-net-algo-lms.c b/qdevices/qdevice-net-algo-lms.c
index c71618d1a1b3a548afff3990625b98416211ea5f..ca98c321d38b1bd61920e5ea2a41a01c4ee41bcb 100644 (file)
--- a/qdevices/qdevice-net-algo-lms.c
+++ b/qdevices/qdevice-net-algo-lms.c
@@ -36,8 +36,8 @@
 
 #include <string.h>
 
+#include "log.h"
 #include "qdevice-net-algo-lms.h"
-#include "qdevice-log.h"
 #include "qdevice-net-send.h"
 #include "qdevice-net-cast-vote-timer.h"
 

diff --git a/qdevices/qdevice-net-algo-test.c b/qdevices/qdevice-net-algo-test.c
index 6bfaec56c229ad6db1fa8a1ff52facdf29bd3dd6..62bc864492b1d3fa69210a6f9e1feeaeaa8f93c4 100644 (file)
--- a/qdevices/qdevice-net-algo-test.c
+++ b/qdevices/qdevice-net-algo-test.c
@@ -36,8 +36,8 @@
 
 #include <string.h>
 
+#include "log.h"
 #include "qdevice-net-algo-test.h"
-#include "qdevice-log.h"
 #include "qdevice-net-send.h"
 #include "qdevice-net-cast-vote-timer.h"
 

diff --git a/qdevices/qdevice-net-algorithm.c b/qdevices/qdevice-net-algorithm.c
index 287e2dcba6531f01592da308602856e9c8391d33..2d51511e119f6d1dd6f5b7fba7d74d20bf17f302 100644 (file)
--- a/qdevices/qdevice-net-algorithm.c
+++ b/qdevices/qdevice-net-algorithm.c
@@ -34,9 +34,9 @@
 
 #include <sys/types.h>
 
+#include "log.h"
 #include "qnet-config.h"
 #include "qdevice-net-algorithm.h"
-#include "qdevice-log.h"
 
 #include "qdevice-net-algo-test.h"
 #include "qdevice-net-algo-ffsplit.h"

diff --git a/qdevices/qdevice-net-cast-vote-timer.c b/qdevices/qdevice-net-cast-vote-timer.c
index 3289e628dc4f380e5e9cbe17c7aa27502cd422c2..2eddfbe959e137a46fa72f8322d97db7251f18fc 100644 (file)
--- a/qdevices/qdevice-net-cast-vote-timer.c
+++ b/qdevices/qdevice-net-cast-vote-timer.c
@@ -32,8 +32,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "log.h"
 #include "qnet-config.h"
-#include "qdevice-log.h"
 #include "qdevice-net-cast-vote-timer.h"
 #include "qdevice-votequorum.h"
 

diff --git a/qdevices/qdevice-net-echo-request-timer.c b/qdevices/qdevice-net-echo-request-timer.c
index db6a87503cbf1cab25221ace76517dcd50d0e7de..7b3f95c96be367ddb9ff3f346b228c4d3fc573b6 100644 (file)
--- a/qdevices/qdevice-net-echo-request-timer.c
+++ b/qdevices/qdevice-net-echo-request-timer.c
@@ -32,10 +32,10 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "log.h"
 #include "qdevice-net-algorithm.h"
 #include "qdevice-net-echo-request-timer.h"
 #include "qdevice-net-send.h"
-#include "qdevice-log.h"
 
 static int
 qdevice_net_echo_request_timer_callback(void *data1, void *data2)

diff --git a/qdevices/qdevice-net-heuristics.c b/qdevices/qdevice-net-heuristics.c
index ec8d972966059102e9cb59d14fa892b8f3d4d486..e5aeb370406b6a8ec019c53423bf2f61d8e96e97 100644 (file)
--- a/qdevices/qdevice-net-heuristics.c
+++ b/qdevices/qdevice-net-heuristics.c
@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "qdevice-log.h"
+#include "log.h"
 #include "qdevice-net-algorithm.h"
 #include "qdevice-net-cast-vote-timer.h"
 #include "qdevice-net-heuristics.h"

diff --git a/qdevices/qdevice-net-instance.c b/qdevices/qdevice-net-instance.c
index b3c96ab0a6701f50d0e8b85bfc8ae4b0f971a22e..cd5818eff44a90f2ea7c7762e8455b589f461615 100644 (file)
--- a/qdevices/qdevice-net-instance.c
+++ b/qdevices/qdevice-net-instance.c
@@ -34,8 +34,8 @@
 
 #include <limits.h>
 
+#include "log.h"
 #include "qdevice-config.h"
-#include "qdevice-log.h"
 #include "qdevice-net-instance.h"
 #include "qnet-config.h"
 #include "utils.h"

diff --git a/qdevices/qdevice-net-ipc-cmd.c b/qdevices/qdevice-net-ipc-cmd.c
index 0c7a3d92856bf3f702f1c07beac4c2bd19ef21dc..173ac1c9ab8733f2fab9f0c8a3e5427f8c1d1cbf 100644 (file)
--- a/qdevices/qdevice-net-ipc-cmd.c
+++ b/qdevices/qdevice-net-ipc-cmd.c
@@ -32,8 +32,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "log.h"
 #include "qdevice-net-ipc-cmd.h"
-#include "qdevice-log.h"
 #include "dynar-str.h"
 #include "qdevice-net-algorithm.h"
 #include "utils.h"

diff --git a/qdevices/qdevice-net-msg-received.c b/qdevices/qdevice-net-msg-received.c
index 342e910216d8f83910b484414b517b037fae20a1..14311c5d0dcf4c2d69a68ce35b10e2b84bff1554 100644 (file)
--- a/qdevices/qdevice-net-msg-received.c
+++ b/qdevices/qdevice-net-msg-received.c
@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "qdevice-log.h"
+#include "log.h"
 #include "qdevice-net-algorithm.h"
 #include "qdevice-net-cast-vote-timer.h"
 #include "qdevice-net-heuristics.h"

diff --git a/qdevices/qdevice-net-nss.c b/qdevices/qdevice-net-nss.c
index 88a62ffef05434167e334e76160e5fda42b2c8ac..8869186039bd38d916d33f2b93ae2c69b8525ee4 100644 (file)
--- a/qdevices/qdevice-net-nss.c
+++ b/qdevices/qdevice-net-nss.c
@@ -35,7 +35,7 @@
 #include <sslerr.h>
 #include <secerr.h>
 
-#include "qdevice-log.h"
+#include "log.h"
 #include "qdevice-net-nss.h"
 #include "qdevice-net-instance.h"
 #include "qnet-config.h"

diff --git a/qdevices/qdevice-net-poll.c b/qdevices/qdevice-net-poll.c
index 12286646848478ea03e192f465ba4f32bdfa015a..b9e0e87023a4252b45557b894ae0473c90e493e6 100644 (file)
--- a/qdevices/qdevice-net-poll.c
+++ b/qdevices/qdevice-net-poll.c
@@ -32,9 +32,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "log.h"
 #include "qdevice-cmap.h"
 #include "qdevice-net-poll.h"
-#include "qdevice-log.h"
 #include "qdevice-net-send.h"
 #include "qdevice-net-socket.h"
 #include "qdevice-votequorum.h"

diff --git a/qdevices/qdevice-net-send.c b/qdevices/qdevice-net-send.c
index 3443eb67bb1549eeeeab1ca252cecbe3b005ef0f..83d5c7b9a6667304ef77ccde8a606efbcd4c9207 100644 (file)
--- a/qdevices/qdevice-net-send.c
+++ b/qdevices/qdevice-net-send.c
@@ -32,8 +32,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "qdevice-log.h"
-#include "qdevice-log-debug.h"
+#include "log.h"
+#include "log-common.h"
 #include "qdevice-net-send.h"
 #include "qdevice-net-votequorum.h"
 #include "msg.h"
@@ -186,7 +186,7 @@ qdevice_net_send_config_node_list(struct qdevice_net_instance *instance,
 
        log(LOG_DEBUG, "Sending config node list seq = "UTILS_PRI_MSG_SEQ,
            instance->last_msg_seq_num);
-       qdevice_log_debug_dump_node_list(nlist);
+       log_common_debug_dump_node_list(nlist);
 
        if (msg_create_node_list(&send_buffer->buffer, instance->last_msg_seq_num,
            (initial ? TLV_NODE_LIST_TYPE_INITIAL_CONFIG : TLV_NODE_LIST_TYPE_CHANGED_CONFIG),
@@ -271,7 +271,7 @@ qdevice_net_send_membership_node_list(struct qdevice_net_instance *instance,
        log(LOG_DEBUG, "Sending membership node list seq = "UTILS_PRI_MSG_SEQ", "
            "ringid = ("UTILS_PRI_RING_ID"), heuristics = %s.", instance->last_msg_seq_num,
            ring_id->node_id, ring_id->seq, tlv_heuristics_to_str(heuristics));
-       qdevice_log_debug_dump_node_list(&nlist);
+       log_common_debug_dump_node_list(&nlist);
 
        if (msg_create_node_list(&send_buffer->buffer, instance->last_msg_seq_num,
            TLV_NODE_LIST_TYPE_MEMBERSHIP,
@@ -333,7 +333,7 @@ qdevice_net_send_quorum_node_list(struct qdevice_net_instance *instance,
 
        log(LOG_DEBUG, "Sending quorum node list seq = "UTILS_PRI_MSG_SEQ", quorate = %u",
            instance->last_msg_seq_num, quorate);
-       qdevice_log_debug_dump_node_list(&nlist);
+       log_common_debug_dump_node_list(&nlist);
 
        if (msg_create_node_list(&send_buffer->buffer, instance->last_msg_seq_num,
            TLV_NODE_LIST_TYPE_QUORUM,

diff --git a/qdevices/qdevice-net-socket.c b/qdevices/qdevice-net-socket.c
index d8923979d53ebb43106d33a0e9119da1c20997f6..be407239b8884b8da1c0b496c8d44c54d634a17b 100644 (file)
--- a/qdevices/qdevice-net-socket.c
+++ b/qdevices/qdevice-net-socket.c
@@ -32,10 +32,10 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "log.h"
 #include "msg.h"
 #include "msgio.h"
 #include "qnet-config.h"
-#include "qdevice-log.h"
 #include "qdevice-net-msg-received.h"
 #include "qdevice-net-nss.h"
 #include "qdevice-net-send.h"

diff --git a/qdevices/qdevice-net-votequorum.c b/qdevices/qdevice-net-votequorum.c
index 4ab0002fbab6a42f3314dde47983cfd6ffb576d9..901a8e980d16573ed1b04ebc4417994c5a6f8661 100644 (file)
--- a/qdevices/qdevice-net-votequorum.c
+++ b/qdevices/qdevice-net-votequorum.c
@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "qdevice-log.h"
+#include "log.h"
 #include "qdevice-net-votequorum.h"
 
 enum tlv_node_state

diff --git a/qdevices/qdevice-votequorum.c b/qdevices/qdevice-votequorum.c
index dbffa8b83bd435657856de2d198bf99abc5eb7b7..6bc3e55d340d271ce19ec46237fce480a7cc3735 100644 (file)
--- a/qdevices/qdevice-votequorum.c
+++ b/qdevices/qdevice-votequorum.c
@@ -34,8 +34,8 @@
 
 #include <poll.h>
 
+#include "log.h"
 #include "qdevice-config.h"
-#include "qdevice-log.h"
 #include "qdevice-votequorum.h"
 #include "qdevice-model.h"
 #include "utils.h"