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>

(cherry picked from corosync-qdevice project commit
 313d42d1e17e145fef5c47970eac447c7e9f171a)

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 \

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"

qdevices/qdevice-log-debug.c → qdevices/log-common.c

@@ -32,12 +32,12 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "qdevice-log-debug.h"
-#include "qdevice-log.h"
+#include "log.h"
+#include "log-common.h"
 #include "utils.h"
 
 void
-qdevice_log_debug_dump_node_list(const struct node_list *nlist)
+log_common_debug_dump_node_list(const struct node_list *nlist)
 {
 	struct node_list_entry *node_info;
 	size_t zi;

qdevices/qdevice-log-debug.h → qdevices/log-common.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016 Red Hat, Inc.
+ * Copyright (c) 2015-2019 Red Hat, Inc.
  *
  * All rights reserved.
  *
@@ -32,8 +32,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _QDEVICE_LOG_DEBUG_H_
-#define _QDEVICE_LOG_DEBUG_H_
+#ifndef _LOG_COMMON_H_
+#define _LOG_COMMON_H_
 
 #include "node-list.h"
 
@@ -41,10 +41,10 @@
 extern "C" {
 #endif
 
-extern void		qdevice_log_debug_dump_node_list(const struct node_list *nlist);
+extern void		log_common_debug_dump_node_list(const struct node_list *nlist);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* _QDEVICE_LOG_DEBUG_H_ */
+#endif /* _LOG_COMMON_H_ */

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;

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) {

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,

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

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"

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"
 

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"

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"

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"

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"
 

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"
 

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"

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"
 

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"
 

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"

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"
 

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)

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"

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"

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"

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"

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"

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"

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,

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"

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

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"