cluster: master - groupd/fenced/dlm_controld/gfs_controld: startupinfo messages

[David Teigland <teigland at fedoraproject dot org>]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=1aa4232e1c0f6f5a127b78bb38851cde5e044479
Commit:        1aa4232e1c0f6f5a127b78bb38851cde5e044479
Parent:        af70cf1c6748d9b8989e412ffd5c08fed0f43665
Author:        David Teigland <teigland@redhat.com>
AuthorDate:    Fri Nov 21 15:50:35 2008 -0600
Committer:     David Teigland <teigland@redhat.com>
CommitterDate: Fri Nov 21 16:26:44 2008 -0600

groupd/fenced/dlm_controld/gfs_controld: startup info messages

When each daemon starts have it log an INFO message showing its name
and version.  Also, have groupd consistently log and INFO message showing
the the compat mode that's been selected.

Signed-off-by: David Teigland <teigland@redhat.com>
---
 fence/fenced/main.c        |    1 +
 group/daemon/cpg.c         |   18 +++++++++++++++++-
 group/daemon/gd_internal.h |   16 +++++-----------
 group/daemon/main.c        |   11 ++++++++---
 group/dlm_controld/main.c  |    1 +
 group/gfs_controld/main.c  |    1 +
 6 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/fence/fenced/main.c b/fence/fenced/main.c
index 320e1f0..a1d06ac 100644
--- a/fence/fenced/main.c
+++ b/fence/fenced/main.c
@@ -1023,6 +1023,7 @@ int main(int argc, char **argv)
 		umask(0);
 	}
 	init_logging();
+	log_level(LOG_INFO, "fenced %s", RELEASE_VERSION);
 	signal(SIGTERM, sigterm_handler);
 	set_oom_adj(-16);
 
diff --git a/group/daemon/cpg.c b/group/daemon/cpg.c
index 6dd98cb..fe47ad8 100644
--- a/group/daemon/cpg.c
+++ b/group/daemon/cpg.c
@@ -182,7 +182,23 @@ static void set_group_mode(void)
 
 		group_mode = node->ver.group_mode;
 
-		log_print("group mode is %s", mode_str(group_mode));
+		switch (group_mode) {
+		case GROUP_PENDING:
+			/* shouldn't happen */
+			log_level(LOG_INFO, "groupd compatibility mode 2 ver");
+			break;
+		case GROUP_LIBGROUP:
+			log_level(LOG_INFO, "groupd compatibility mode 1 ver");
+			break;
+		case GROUP_LIBCPG:
+			log_level(LOG_INFO, "groupd compatibility mode 0 ver");
+			break;
+		default:
+			log_level(LOG_INFO, "groupd compatibility mode %d ver",
+				  group_mode);
+			break;
+		}
+
 		log_debug("set_group_mode %s matching nodeid %d got_from %d",
 			  mode_str(group_mode), node->nodeid, node->got_from);
 		break;
diff --git a/group/daemon/gd_internal.h b/group/daemon/gd_internal.h
index 4e803bb..1927104 100644
--- a/group/daemon/gd_internal.h
+++ b/group/daemon/gd_internal.h
@@ -70,15 +70,18 @@ extern int cfgd_debug_logfile;
 
 void daemon_dump_save(void);
 
-#define log_debug(fmt, args...) \
+#define log_level(lvl, fmt, args...) \
 do { \
 	snprintf(daemon_debug_buf, 255, "%ld " fmt "\n", time(NULL), ##args); \
 	daemon_dump_save(); \
-	logt_print(LOG_DEBUG, fmt "\n", ##args); \
+	logt_print(lvl, fmt "\n", ##args); \
 	if (daemon_debug_opt) \
 		fprintf(stderr, "%s", daemon_debug_buf); \
 } while (0)
 
+#define log_debug(fmt, args...) log_level(LOG_DEBUG, fmt, ##args)
+#define log_print(fmt, args...) log_level(LOG_ERR, fmt, ##args)
+
 #define log_group(g, fmt, args...) \
 do { \
 	snprintf(daemon_debug_buf, 255, "%ld %d:%s " fmt "\n", time(NULL), \
@@ -89,15 +92,6 @@ do { \
 		fprintf(stderr, "%s", daemon_debug_buf); \
 } while (0)
 
-#define log_print(fmt, args...) \
-do { \
-	snprintf(daemon_debug_buf, 255, "%ld " fmt "\n", time(NULL), ##args); \
-	daemon_dump_save(); \
-	logt_print(LOG_ERR, fmt "\n", ##args); \
-	if (daemon_debug_opt) \
-		fprintf(stderr, "%s", daemon_debug_buf); \
-} while (0)
-
 #define log_error(g, fmt, args...) \
 do { \
 	snprintf(daemon_debug_buf, 255, "%ld %d:%s " fmt "\n", time(NULL), \
diff --git a/group/daemon/main.c b/group/daemon/main.c
index 5ac1c87..5b07505 100644
--- a/group/daemon/main.c
+++ b/group/daemon/main.c
@@ -767,12 +767,16 @@ static void loop(void)
 
 	setup_logging();
 
-	if (cfgd_groupd_compat == 0)
+	if (cfgd_groupd_compat == 0) {
 		group_mode = GROUP_LIBCPG;
-	else if (cfgd_groupd_compat == 1)
+		log_level(LOG_INFO, "groupd compatibility mode 0 cfg");
+	} else if (cfgd_groupd_compat == 1) {
 		group_mode = GROUP_LIBGROUP;
-	else if (cfgd_groupd_compat == 2)
+		log_level(LOG_INFO, "groupd compatibility mode 1 cfg");
+	} else if (cfgd_groupd_compat == 2) {
 		group_mode = GROUP_PENDING;
+		/* report the mode in set_group_mode() */
+	}
 
 	rv = setup_cpg();
 	if (rv < 0)
@@ -1025,6 +1029,7 @@ int main(int argc, char *argv[])
 		}
 	}
 	init_logging();
+	log_level(LOG_INFO, "groupd %s", RELEASE_VERSION);
 	signal(SIGTERM, sigterm_handler);
 	set_scheduler();
 	set_oom_adj(-16);
diff --git a/group/dlm_controld/main.c b/group/dlm_controld/main.c
index bdb279a..55d7cc9 100644
--- a/group/dlm_controld/main.c
+++ b/group/dlm_controld/main.c
@@ -1262,6 +1262,7 @@ int main(int argc, char **argv)
 		}
 	}
 	init_logging();
+	log_level(LOG_INFO, "dlm_controld %s", RELEASE_VERSION);
 	signal(SIGTERM, sigterm_handler);
 	set_scheduler();
 	set_oom_adj(-16);
diff --git a/group/gfs_controld/main.c b/group/gfs_controld/main.c
index cab44f1..714ecb0 100644
--- a/group/gfs_controld/main.c
+++ b/group/gfs_controld/main.c
@@ -1473,6 +1473,7 @@ int main(int argc, char **argv)
 		}
 	}
 	init_logging();
+	log_level(LOG_INFO, "gfs_controld %s", RELEASE_VERSION);
 	signal(SIGTERM, sigterm_handler);
 	set_scheduler();
 	set_oom_adj(-16);