Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: ldirectord by horms from
([email protected])
2. Linux-HA CVS: ldirectord by horms from
([email protected])
3. Linux-HA CVS: ldirectord by horms from
([email protected])
4. Linux-HA CVS: ldirectord by horms from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 4 Apr 2006 20:16:29 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: ldirectord by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : ldirectord
Dir : linux-ha/ldirectord
Modified Files:
Tag: STABLE_1_2
ldirectord
Log Message:
Sync with 1.132
Test for istead of defined as (Fedora Core at least) the latter is always
true.
Jan Yenya Kasprzak
http://www.osdl.org/developer_bugzilla/show_bug.cgi?id=1180
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/ldirectord,v
retrieving revision 1.77.2.42
retrieving revision 1.77.2.43
diff -u -3 -r1.77.2.42 -r1.77.2.43
--- ldirectord 23 Mar 2006 00:01:21 -0000 1.77.2.42
+++ ldirectord 5 Apr 2006 02:16:28 -0000 1.77.2.43
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.77.2.42 2006/03/23 00:01:21 horms Exp
$)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.77.2.43 2006/04/05 02:16:28 horms Exp
$)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -673,7 +673,7 @@
my $msg = shift;
chomp($msg);
&ld_log("$msg");
- unless (defined $opt_d) {
+ unless ($opt_d) {
print STDERR "$msg\n";
}
ld_exit(1, "Initialisation Error");
@@ -1393,7 +1393,7 @@
chomp($msg);
$msg .= "\n";
- if (defined $opt_d || $initializing==1) {
+ if ($opt_d || $initializing==1) {
if ($line>0) {
print STDERR "Error [$pid] reading file $CONFIG at line
$line: $msg";
} else {
@@ -2838,7 +2838,7 @@
# 1 on error
sub ld_openlog
{
- if (defined $opt_d or $SUPERVISED) {
+ if ($opt_d or $SUPERVISED) {
# Instantly do nothing
return(0);
}
@@ -2874,7 +2874,7 @@
&ld_debug(2, $message);
chomp $message;
- if (defined $opt_d) {
+ if ($opt_d) {
print STDERR "$message\n";
} elsif ($SUPERVISED) {
print "[$now] $message\n";
------------------------------
Message: 2
Date: Tue, 4 Apr 2006 20:17:45 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: ldirectord by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : ldirectord
Dir : linux-ha/ldirectord
Modified Files:
Tag: STABLE_1_2
ldirectord
Log Message:
Sync with 1.134
When daemonised, use /dev/null instead of /dev/console for stdout and stderr as
/dev/console may not always be available
Jan Yenya Kasprzak
http://www.osdl.org/developer_bugzilla/show_bug.cgi?id=1180
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/ldirectord,v
retrieving revision 1.77.2.43
retrieving revision 1.77.2.44
diff -u -3 -r1.77.2.43 -r1.77.2.44
--- ldirectord 5 Apr 2006 02:16:28 -0000 1.77.2.43
+++ ldirectord 5 Apr 2006 02:17:44 -0000 1.77.2.44
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.77.2.43 2006/04/05 02:16:28 horms Exp
$)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.77.2.44 2006/04/05 02:17:44 horms Exp
$)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -3362,14 +3362,19 @@
# and open `/dev/null' as stdin; alternatively, you could open
# `/dev/console' as stderr and/or stdout, and `/dev/null' as stdin, or
# any other combination that makes sense for your particular daemon.
+ #
+ # This code used to open /dev/console for STDOUT and STDERR,
+ # but that was changed to /dev/null to stop the code hanging in
+ # the case where /dev/console is unavailable for some reason
+ # http://www.osdl.org/developer_bugzilla/show_bug.cgi?id=1180
if(open(STDIN, "</dev/null")<0){
&ld_exit(1, "ld_daemon: Could not open /dev/null");
}
- if(open(STDOUT, ">>/dev/console")<0){
- &ld_exit(-1, "ld_daemon: Could not open /dev/console");
+ if(open(STDOUT, ">>/dev/null")<0){
+ &ld_exit(-1, "ld_daemon: Could not open /dev/null");
}
- if(open(STDERR, ">>/dev/console")<0){
- &ld_exit(-1, "ld_daemon: Could not open /dev/console");
+ if(open(STDERR, ">>/dev/null")<0){
+ &ld_exit(-1, "ld_daemon: Could not open /dev/null");
}
}
------------------------------
Message: 3
Date: Tue, 4 Apr 2006 20:18:28 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: ldirectord by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : ldirectord
Dir : linux-ha/ldirectord
Modified Files:
Tag: STABLE_1_2
ldirectord
Log Message:
Sync with 1.135
Only log to stdio during init
Jan Yenya Kasprzak
http://www.osdl.org/developer_bugzilla/show_bug.cgi?id=1180
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/ldirectord,v
retrieving revision 1.77.2.44
retrieving revision 1.77.2.45
diff -u -3 -r1.77.2.44 -r1.77.2.45
--- ldirectord 5 Apr 2006 02:17:44 -0000 1.77.2.44
+++ ldirectord 5 Apr 2006 02:18:28 -0000 1.77.2.45
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.77.2.44 2006/04/05 02:17:44 horms Exp
$)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.77.2.45 2006/04/05 02:18:28 horms Exp
$)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -685,7 +685,6 @@
sub ld_handler_term
{
my ($signal) = (@_);
- print STDERR "ldirectord $CFGNAME received signal: $signal\n";
if ($LD_TERM_CALLED){
$SIG{'__DIE__'} = "IGNORE";
$SIG{"$signal"} = "IGNORE";
------------------------------
Message: 4
Date: Tue, 4 Apr 2006 20:19:06 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: ldirectord by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : ldirectord
Dir : linux-ha/ldirectord
Modified Files:
Tag: STABLE_1_2
ldirectord
Log Message:
Sync with 1.136
Only log to stdio during init
Jan Yenya Kasprzak
http://www.osdl.org/developer_bugzilla/show_bug.cgi?id=1180
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/ldirectord,v
retrieving revision 1.77.2.45
retrieving revision 1.77.2.46
diff -u -3 -r1.77.2.45 -r1.77.2.46
--- ldirectord 5 Apr 2006 02:18:28 -0000 1.77.2.45
+++ ldirectord 5 Apr 2006 02:19:06 -0000 1.77.2.46
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.77.2.45 2006/04/05 02:18:28 horms Exp
$)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.77.2.46 2006/04/05 02:19:06 horms Exp
$)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -684,7 +684,7 @@
# If we get a sinal then log it and quit
sub ld_handler_term
{
- my ($signal) = (@_);
+ my ($signal) = (@_);
if ($LD_TERM_CALLED){
$SIG{'__DIE__'} = "IGNORE";
$SIG{"$signal"} = "IGNORE";
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 22
********************************************
