RE: david nolan's patches
I like the idea of Sourceforge, insofar as it has much more than just CVS: a ready-made structure for documentation, FAQs, web page, collaborative development, etc. If the developers were really set on subversion, the Sourceforge CVS could be used just to distribute stable and devel releases, and all the dirty work of actual development and testing could take place behind the scenes, using subversion set up somewhere else. Scott Prater Dpto. Sistemas [EMAIL PROTECTED] SERVICOM 2000 Av. Primado Reig, 189 entlo. 46020 Valencia - Spain Tel. (+34) 96 332 12 00 Fax. (+34) 96 332 12 01 www.servicom2000.com -Mensaje original- De: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] nombre de Jim Trocki Enviado el: lunes, 07 de junio de 2004 22:33 Para: David Nolan CC: mon mailing list Asunto: Re: david nolan's patches On Thu, 3 Jun 2004, David Nolan wrote: (In fact, I may have posted it to the list, but I can't recall right now. Time for some email archeology.) ahh, i apologize for my confusion. clearly my recollection was faulty, and you now corrected it. thanks. as far as maintaining the code in cvs with the intention of allowing better cooperation amongst ourselves, i think it's a good idea. i don't know if the sourceforge thing is what would be best. it does have some advantages, such as the bug tracking functionality, mon is already a registered project there and all (i haven't looked at that thing in forever), but cvs tends to aggravate me. i guess i've been living with it long enough to just accept it if that's all that sourceforge offers. i'd prefer giving subversion a try. thoughts? ___ mon mailing list [EMAIL PROTECTED] http://linux.kernel.org/mailman/listinfo/mon ___ mon mailing list [EMAIL PROTECTED] http://linux.kernel.org/mailman/listinfo/mon
Re: david nolan's patches
--On Monday, June 07, 2004 1:32 PM -0700 Jim Trocki [EMAIL PROTECTED] wrote: On Thu, 3 Jun 2004, David Nolan wrote: (In fact, I may have posted it to the list, but I can't recall right now. Time for some email archeology.) ahh, i apologize for my confusion. clearly my recollection was faulty, and you now corrected it. thanks. as far as maintaining the code in cvs with the intention of allowing better cooperation amongst ourselves, i think it's a good idea. i don't know if the sourceforge thing is what would be best. it does have some advantages, such as the bug tracking functionality, mon is already a registered project there and all (i haven't looked at that thing in forever), but cvs tends to aggravate me. i guess i've been living with it long enough to just accept it if that's all that sourceforge offers. i'd prefer giving subversion a try. Since I use CVS everyday for all the project I work on, CVS would be fine with me. If you prefer another option, I'm sure we can work it out. Ultimately, I'll be continuing to maintain the CMU custom version in our CVS tree, and importing changes from your version. So I'll have to deal with two different repositories anyway. Sourceforge CVS would seem to be the easiest path, and as Scott points out it gives us some other features as well. If you don't have any strenuous objections, why don't we go ahead and start using sourceforge? Upload the current stable version and the devel version, give me access, and I'll work on integrating my changes. (My sourceforge userid is vitroth) -David David Nolan*[EMAIL PROTECTED] curses: May you be forced to grep the termcap of an unclean yacc while a herd of rogue emacs fsck your troff and vgrind your pathalias! ___ mon mailing list [EMAIL PROTECTED] http://linux.kernel.org/mailman/listinfo/mon
Re: david nolan's patches
On Thu, 3 Jun 2004, David Nolan wrote: (In fact, I may have posted it to the list, but I can't recall right now. Time for some email archeology.) ahh, i apologize for my confusion. clearly my recollection was faulty, and you now corrected it. thanks. as far as maintaining the code in cvs with the intention of allowing better cooperation amongst ourselves, i think it's a good idea. i don't know if the sourceforge thing is what would be best. it does have some advantages, such as the bug tracking functionality, mon is already a registered project there and all (i haven't looked at that thing in forever), but cvs tends to aggravate me. i guess i've been living with it long enough to just accept it if that's all that sourceforge offers. i'd prefer giving subversion a try. thoughts? ___ mon mailing list [EMAIL PROTECTED] http://linux.kernel.org/mailman/listinfo/mon
david nolan's patches
attached is the diff -u between mon 0.99.2-6 and the version which
david nolan sent to me. if someone would like to merge them into the
most recent -devel version, test it all to be sure it works, and then
post their results, then i'm sure it would be appreciated.
this is a matter of historical record which should be public. rather
than post his patched version to the mailing list for everyone to have a
gander at and do something with if they chose, he sent them only to me
(afaik), and since then i've been implicated as the reason why those
patches haven't been distributed to anyone else. i don't think that's
the right way to make progress, so i'm posting the diff between what he
sent to me and the closest release to it at the time, which is 0.99.2.
--- mon 2001-09-08 09:42:05.0 -0400
+++ /home/trockij/mon/patches/mon-nolan-2.0 2003-06-04 10:14:59.0 -0400
@@ -4,7 +4,7 @@
#
# Jim Trocki, [EMAIL PROTECTED]
#
-# $Id: mon 1.27 Sat, 08 Sep 2001 09:42:05 -0400 trockij $
+# $Id: mon,v 2.0 2002/09/27 12:53:43 vitroth Exp $
#
# Copyright (C) 1998 Jim Trocki
#
@@ -25,7 +25,7 @@
#
use strict;
-my $RCSID='$Id: mon 1.27 Sat, 08 Sep 2001 09:42:05 -0400 trockij $';
+my $RCSID='$Id: mon,v 2.0 2002/09/27 12:53:43 vitroth Exp $';
my $AUTHOR='[EMAIL PROTECTED]';
my $RELEASE='$ProjectVersion: mon-0-99-2.6 $';
@@ -65,6 +65,7 @@
sub debug;
sub debug_dir;
sub dep_ok;
+sub dep_summary;
sub depend;
sub dhmstos;
sub die_die;
@@ -184,7 +185,7 @@
my ($FL_MONITOR, $FL_UPALERT, # alert type flags
$FL_TRAP, $FL_TRAPTIMEOUT,
- $FL_STARTUPALERT, $FL_TEST);
+ $FL_STARTUPALERT, $FL_TEST, $FL_REDISTRIBUTE);
my $TRAP_PDU;
my (%ALERTHASH, %MONITORHASH); # hash of pathnames for
@@ -198,7 +199,7 @@
#
# argument parsing
#
-getopts (fhlMSvda:A:b:B:c:D:i:L:m:O:o:p:P:r:s:t:, \%opt);
+getopts (fhMSvda:A:b:B:c:D:i:l:L:m:O:o:p:P:r:s:t:, \%opt);
#
# these two things can be taken care of without
@@ -343,7 +344,18 @@
#
# load previously saved state
#
-load_state (disabled) if ($opt{l});
+if (exists $opt{l}) {
+if ($opt{l}) {
+ # If -l was given an argument (all, disabled, opstatus, etc...)
+ # pass that to load_state
+ load_state($opt{l});
+}else{
+ # Otherwise default to old behavior of just loading disabled
hosts/services/groups
+ load_state(disabled);
+}
+}
+
+
syslog ('info', mon server started);
@@ -369,7 +381,7 @@
#
# skip over disabled watch
#
- next if ($watch_disabled{$group} == 1);
+ next if (exists $watch_disabled{$group} $watch_disabled{$group} == 1);
foreach my $service (keys %{$watch{$group}}) {
@@ -384,7 +396,7 @@
if ($sref-{traptimeout}) {
$sref-{_trap_timer} -= $t;
- if ($sref-{_trap_timer} = 0 $tm - $sref-{_last_uptrap}
+ if ($sref-{_trap_timer} = 0 $tm - $sref-{_last_trap}
$sref-{traptimeout}) {
$sref-{_trap_timer} = $sref-{traptimeout};
handle_trap_timeout ($group, $service);
@@ -411,16 +423,18 @@
{
if (!$CF{MAXPROCS} || $procs $CF{MAXPROCS})
{
- if ($sref-{exclude_period} ne
- inPeriod (time, $sref-{exclude_period}))
+ if (defined $sref-{exclude_period}
+$sref-{exclude_period} ne
+ inPeriod (time, $sref-{exclude_period}))
{
debug (1, not running $group,$service because of
exclude_period\n);
}
- elsif ($sref-{dep_behavior} eq m
- $sref-{depend} ne )
+ elsif (($sref-{dep_behavior} eq m
+ defined $sref-{depend} $sref-{depend} ne )
+ || (defined $sref-{monitordepend}
$sref-{monitordepend} ne ))
{
- if (dep_ok ($sref))
+ if (dep_ok ($sref, 'm'))
{
run_monitor ($group, $service);
}
@@ -509,9 +523,28 @@
my $tmnow = time;
#
+# if redistribute it set, call it now
+#
+if ($sref-{redistribute} ne '')
+{
+ my ($fac, $args);
+ ($fac, $args) = split (/\s+/, $sref-{redistribute}, 2);
+ call_alert (
+ group = $group,
+ service = $service,
+ output = $output,
+ retval = $retval,
+ flags = $flags | $FL_REDISTRIBUTE,
+
+ alert = $fac,
+ args= $args,
+ )
+}
+
+#
# if the
Re: david nolan's patches
--On Thursday, June 03, 2004 10:52 AM -0700 Jim Trocki [EMAIL PROTECTED] wrote: this is a matter of historical record which should be public. rather than post his patched version to the mailing list for everyone to have a gander at and do something with if they chose, he sent them only to me (afaik), and since then i've been implicated as the reason why those patches haven't been distributed to anyone else. i don't think that's the right way to make progress, so i'm posting the diff between what he sent to me and the closest release to it at the time, which is 0.99.2. If you're looking to have an accurate historical record, you should at least post the long description I sent you of the patch. As I recall, I itemized the entire patch, breaking it down into about 20 different changes, and for EVERY LINE in the patch I documented which changes it was a part of. I spent a couple of hours doing that, so that you could pick and choose which portions of the patch you wanted to apply. If you no longer have that information, I can dig it up. (In fact, I may have posted it to the list, but I can't recall right now. Time for some email archeology.) By the way, Jim, I don't want you to feel like we're upset with you personally. But the problem is that last spring the issue of new mon releases came up, and we had several people interested in doing joint development of the system. But you spoke up and said you had some new versions for us to test, and you still wanted to be the primary maintainer. We all accepted that and trusted you to move the project forward. But it has become increasingly clear to most of us that you just don't have the time to do more then maintenance releases to Mon, and maybe not even that. Many of us are willing to volunteer our time to help Mon continue to evolve and become a better system. Please let us help you! ___ mon mailing list [EMAIL PROTECTED] http://linux.kernel.org/mailman/listinfo/mon
Re: david nolan's patches
On Thu, Jun 03, 2004 at 10:52:03AM -0700, Jim Trocki wrote: this is a matter of historical record which should be public. rather than post his patched version to the mailing list for everyone to have a gander at and do something with if they chose, he sent them only to me Sounds like he wanted to respect your role as maintainer of Mon, and run major changes by you before releasing them to anyone else. The patches probably arrived at a moment when you didn't have time to look at them, allowing the misunderstanding and subsequent miscommunication to fester. These kinds of problems would be less likely to happen if we were using Sourceforge or the like, since both the latest development version and submitted patches would be publicly visible to all. -- Ed ___ mon mailing list [EMAIL PROTECTED] http://linux.kernel.org/mailman/listinfo/mon
Re: david nolan's patches
--On Thursday, June 03, 2004 2:25 PM -0400 Ed Ravin [EMAIL PROTECTED] wrote: On Thu, Jun 03, 2004 at 10:52:03AM -0700, Jim Trocki wrote: this is a matter of historical record which should be public. rather than post his patched version to the mailing list for everyone to have a gander at and do something with if they chose, he sent them only to me Sounds like he wanted to respect your role as maintainer of Mon, and run major changes by you before releasing them to anyone else. The patches probably arrived at a moment when you didn't have time to look at them, allowing the misunderstanding and subsequent miscommunication to fester. Bingo. In fact, here's a quote from a message I sent to mon-l last June: If anyone is interested in using my code, contact me and I'll point you to our CVS repository. (Note: I'm *not* interested in forking mon, but if more people are testing my code, maybe Jim will be willing to integrate it into the mainline more quickly.) I even got a request for access from Jim, and in the message I sent him I gave the URL for our CVS repository and said (among other things): I'm intending to fix these issues before sending you a patch. But, as I said, I'm waiting till you release something resembling my CVS version 2.0 (which is the version I assigned to the last patch I sent to you), and then I'll send you another patch, or patches. I'm not going to send this URL to the mon list. I don't want tons of people using this code, because I'm trying to discourage a mon fork. These kinds of problems would be less likely to happen if we were using Sourceforge or the like, since both the latest development version and submitted patches would be publicly visible to all. Any publicly available CVS repository would be great. I'm not sure whether sourceforge is the best option, but ultimately I don't care as long as it works. David Nolan Network Software Developer Computing Services Carnegie Mellon University ___ mon mailing list [EMAIL PROTECTED] http://linux.kernel.org/mailman/listinfo/mon
