This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
The tag: cmirror_1_1_33 has been created
- From: Chris Feist <cfeist at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Mon, 27 Oct 2008 19:49:42 +0000 (UTC)
- Subject: The tag: cmirror_1_1_33 has been created
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d029acbadfbb3dc3170d30b00c317bf7e7616f1d
Commit: d029acbadfbb3dc3170d30b00c317bf7e7616f1d
Parent: 2d12836022d1a1de4889c842757af8e483a4bf96
Author: David Teigland <teigland@redhat.com>
AuthorDate: Mon Oct 27 13:41:12 2008 -0500
Committer: David Teigland <teigland@redhat.com>
CommitterDate: Mon Oct 27 13:41:12 2008 -0500
groupd/fenced/dlm_controld/gfs_controld: init logging after fork
Initializing logging creates threads which is complicated by forking.
Move logging init after fork, since we don't use it until then anyway.
Signed-off-by: David Teigland <teigland@redhat.com>
---
fence/fenced/main.c | 5 +----
group/daemon/main.c | 5 +----
group/dlm_controld/main.c | 5 +----
group/gfs_controld/main.c | 5 +----
4 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/fence/fenced/main.c b/fence/fenced/main.c
index 0c1d960..e515efa 100644
--- a/fence/fenced/main.c
+++ b/fence/fenced/main.c
@@ -1012,10 +1012,7 @@ int main(int argc, char **argv)
INIT_LIST_HEAD(&domains);
INIT_LIST_HEAD(&controlled_entries);
- init_logging();
-
read_arguments(argc, argv);
-
lockfile();
if (!daemon_debug_opt) {
@@ -1025,8 +1022,8 @@ int main(int argc, char **argv)
}
umask(0);
}
+ init_logging();
signal(SIGTERM, sigterm_handler);
-
set_oom_adj(-16);
loop();
diff --git a/group/daemon/main.c b/group/daemon/main.c
index c875f14..3faac73 100644
--- a/group/daemon/main.c
+++ b/group/daemon/main.c
@@ -1017,10 +1017,7 @@ int main(int argc, char *argv[])
for (i = 0; i < MAX_LEVELS; i++)
INIT_LIST_HEAD(&gd_levels[i]);
- init_logging();
-
read_arguments(argc, argv);
-
lockfile();
if (!daemon_debug_opt) {
@@ -1029,8 +1026,8 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
}
+ init_logging();
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 53edeb8..4761ce7 100644
--- a/group/dlm_controld/main.c
+++ b/group/dlm_controld/main.c
@@ -1250,10 +1250,7 @@ int main(int argc, char **argv)
INIT_LIST_HEAD(&lockspaces);
INIT_LIST_HEAD(&fs_register_list);
- init_logging();
-
read_arguments(argc, argv);
-
lockfile();
if (!daemon_debug_opt) {
@@ -1262,8 +1259,8 @@ int main(int argc, char **argv)
exit(EXIT_FAILURE);
}
}
+ init_logging();
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 b465239..1982d34 100644
--- a/group/gfs_controld/main.c
+++ b/group/gfs_controld/main.c
@@ -1458,10 +1458,7 @@ int main(int argc, char **argv)
INIT_LIST_HEAD(&mountgroups);
INIT_LIST_HEAD(&withdrawn_mounts);
- init_logging();
-
read_arguments(argc, argv);
-
lockfile();
if (!daemon_debug_opt) {
@@ -1470,8 +1467,8 @@ int main(int argc, char **argv)
exit(EXIT_FAILURE);
}
}
+ init_logging();
signal(SIGTERM, sigterm_handler);
-
set_scheduler();
set_oom_adj(-16);