benson-commit — Benson Commit Mailing List

[Benson-commit] CVS: benson2/src/modules/contrib Makefile.in,1.5,1.6

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/modules/contrib
In directory usw-pr-cvs1:/tmp/cvs-serv25751/src/modules/contrib

Modified Files:
	Makefile.in 
Log Message:
Added special aweful good configure.in

Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/contrib/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Makefile.in	2001/06/03 23:33:40	1.5
--- Makefile.in	2001/07/17 01:57:59	1.6
***************
*** 1,3 ****
! # Makefile.in generated automatically by automake 1.4-p2 from Makefile.am
  
  # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
--- 1,3 ----
! # Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
  
  # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.

[Benson-commit] CVS: benson2/src/scripts bensonctl.tmpl,1.4,1.5

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv27449/src/scripts

Modified Files:
	bensonctl.tmpl 
Log Message:
Some architectural changes, mostly relating to orb address binding and bensonctl startup

Index: bensonctl.tmpl
===================================================================
RCS file: /cvsroot/benson/benson2/src/scripts/bensonctl.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** bensonctl.tmpl	2001/06/05 01:47:56	1.4
--- bensonctl.tmpl	2001/07/15 19:29:00	1.5
***************
*** 11,16 ****
  BENSON_PORT=`grep "^Port" $BENSON_HOME/etc/benson.cfg | awk '{print $2}'`
  RM=`which rm`
! ADDR="inet:`uname -n`:$BENSON_PORT"
! ORBIIOP="-ORBIIOPAddr" 
  BENSON="$BENSON_HOME/sbin/bensond"
  LD_LIBRARY_PATH=/usr/local/lib:/usr/local/ssl/lib
--- 11,16 ----
  BENSON_PORT=`grep "^Port" $BENSON_HOME/etc/benson.cfg | awk '{print $2}'`
  RM=`which rm`
! #ADDR="inet:`uname -n`:$BENSON_PORT"
! #ORBIIOP="-ORBIIOPAddr" 
  BENSON="$BENSON_HOME/sbin/bensond"
  LD_LIBRARY_PATH=/usr/local/lib:/usr/local/ssl/lib
***************
*** 28,32 ****
  	else
  		echo "Starting bensond ..."
! 		$BENSON $ORBIIOP $ADDR
  	fi
  	;;
--- 28,33 ----
  	else
  		echo "Starting bensond ..."
! #		$BENSON $ORBIIOP $ADDR
! 		$BENSON
  	fi
  	;;

[Benson-commit] CVS: benson2/src bensond.cc,1.9,1.10

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src
In directory usw-pr-cvs1:/tmp/cvs-serv27449/src

Modified Files:
	bensond.cc 
Log Message:
Some architectural changes, mostly relating to orb address binding and bensonctl startup

Index: bensond.cc
===================================================================
RCS file: /cvsroot/benson/benson2/src/bensond.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** bensond.cc	2001/05/20 05:54:16	1.9
--- bensond.cc	2001/07/15 19:29:00	1.10
***************
*** 61,64 ****
--- 61,68 ----
  	string stderr_log;
  	string stdout_log;
+ 	char* fargv[4];
+ 	int fargc = 0;
+ 	fargv[fargc++] = "bensond";
+ 	fargv[fargc++] = "-ORBIIOPAddr";
  
  	stderr_log = _BENSON_HOME;
***************
*** 74,85 ****
  
  	try {
  		sref = benson_config_init(perl_object);
  
  
  		CORBA::Object_var o;
  		PortableServer::Current_var current;
  
  		CORBA::ORB_var my_orb =
! 			CORBA::ORB_init(argc, argv, "mico-local-orb");
  
  		AccessChecker ac(my_orb, perl_object, sref);
--- 78,99 ----
  
  	try {
+ 		string destination;
+ 		string port;
  		sref = benson_config_init(perl_object);
+ 		destination = SvPVX(perl_object->get(sref, "Hostname"));
+ 		port = SvPVX(perl_object->get(sref, "Port"));
  
+ 		destination = "inet:" + destination + ":" + port;
  
+ 		fargv[fargc++] = (char *)destination.c_str();
+ 		fargv[fargc++] = "-ORBBindAddr";
+ 		fargv[fargc++] = (char *)destination.c_str();
+ 
  		CORBA::Object_var o;
  		PortableServer::Current_var current;
  
  		CORBA::ORB_var my_orb =
! 			CORBA::ORB_init(fargc, fargv, "mico-local-orb");
! 		cerr << fargv[0] << " " << fargv[1] << endl;
  
  		AccessChecker ac(my_orb, perl_object, sref);
***************
*** 106,114 ****
  		cerr << "creating ..." << endl;
  		my_orb->run();
  	} catch (PerlException &e) {
  		cerr << e << endl;
  	} catch (CORBA::Exception &e) {
  		cerr << e << endl;
! 		exit(0);
  	}
  
--- 120,131 ----
  		cerr << "creating ..." << endl;
  		my_orb->run();
+ 		cerr << "ending ..." << endl;
  	} catch (PerlException &e) {
  		cerr << e << endl;
  	} catch (CORBA::Exception &e) {
  		cerr << e << endl;
! 		exit(1);
! 	} catch (...) {
! 		cerr << "Caught and unknown exception" << endl;
  	}
  

[Benson-commit] CVS: benson2/src/perl PerlObject.h,1.4,1.5

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/perl
In directory usw-pr-cvs1:/tmp/cvs-serv26249

Modified Files:
	PerlObject.h 
Log Message:
Fixed even more for the argument list

Index: PerlObject.h
===================================================================
RCS file: /cvsroot/benson/benson2/src/perl/PerlObject.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** PerlObject.h	2001/04/17 03:21:23	1.4
--- PerlObject.h	2001/07/15 02:08:29	1.5
***************
*** 34,38 ****
  	SV* get(SV* pkgref, const char *method);
  	SV* set(SV* pkgref, const char *method, const char *value);
! 	SV* BuildIdentity(SV* pkgref, SV* alert_href, const char *agent, const char *sev, const char *sub, const char *msg);
  	SV* call_handler(const char* pkgname, SV* objref);
  private:
--- 34,38 ----
  	SV* get(SV* pkgref, const char *method);
  	SV* set(SV* pkgref, const char *method, const char *value);
! 	SV* BuildIdentity(SV* pkgref, const char *agent, const char *sev, const char *sub, const char *msg);
  	SV* call_handler(const char* pkgname, SV* objref);
  private:

[Benson-commit] CVS: benson2/src/perl PerlObject.cc,1.6,1.7

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/perl
In directory usw-pr-cvs1:/tmp/cvs-serv26026

Modified Files:
	PerlObject.cc 
Log Message:
Fixed even more for the argument list

Index: PerlObject.cc
===================================================================
RCS file: /cvsroot/benson/benson2/src/perl/PerlObject.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** PerlObject.cc	2001/07/15 02:06:30	1.6
--- PerlObject.cc	2001/07/15 02:07:44	1.7
***************
*** 137,141 ****
  	PUSHMARK(SP);
  	XPUSHs(pkg);
- 	XPUSHs(sv_2mortal(alert_href));
  	XPUSHs(sv_2mortal(newSVpv(agent,0)));
  	XPUSHs(sv_2mortal(newSVpv(sev,0)));
--- 137,140 ----

[Benson-commit] CVS: benson2/src/perl PerlObject.cc,1.5,1.6

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/perl
In directory usw-pr-cvs1:/tmp/cvs-serv25848

Modified Files:
	PerlObject.cc 
Log Message:
Doh, need to update the argument list for BuildIdentity

Index: PerlObject.cc
===================================================================
RCS file: /cvsroot/benson/benson2/src/perl/PerlObject.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** PerlObject.cc	2001/04/17 03:21:23	1.5
--- PerlObject.cc	2001/07/15 02:06:30	1.6
***************
*** 128,132 ****
  
  SV*
! Perl::BuildIdentity(SV *pkg, SV* alert_href, const char *agent, const char *sev, const char* sub, const char *msg) {
  	SV* idref;
  	dSP;
--- 128,132 ----
  
  SV*
! Perl::BuildIdentity(SV *pkg, const char *agent, const char *sev, const char* sub, const char *msg) {
  	SV* idref;
  	dSP;

[Benson-commit] CVS: benson2/src/corba Queue_impl.cc,1.7,1.8

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/corba
In directory usw-pr-cvs1:/tmp/cvs-serv24671/src/corba

Modified Files:
	Queue_impl.cc 
Log Message:
This is somewhat experimental stuff, don't use for real

Index: Queue_impl.cc
===================================================================
RCS file: /cvsroot/benson/benson2/src/corba/Queue_impl.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Queue_impl.cc	2001/04/17 03:21:23	1.7
--- Queue_impl.cc	2001/07/15 02:00:55	1.8
***************
*** 95,100 ****
  	Alert current;
  
! 	alert_href = sv_2mortal(this->hv_alert_list());
! 	SV* identity = sv_2mortal(perl_object->BuildIdentity(sref,alert_href,agent,severity,subsystem,message));
  
  	cout << "Submit " << identity << " initiated." << endl;
--- 95,99 ----
  	Alert current;
  
! 	SV* identity = sv_2mortal(perl_object->BuildIdentity(sref,agent,severity,subsystem,message));
  
  	cout << "Submit " << identity << " initiated." << endl;

[Benson-commit] CVS: benson2/src/modules/Benson Benson.xs,1.9,1.10 Queue_util.cc,1.3,1.4

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/modules/Benson
In directory usw-pr-cvs1:/tmp/cvs-serv24671/src/modules/Benson

Modified Files:
	Benson.xs Queue_util.cc 
Log Message:
This is somewhat experimental stuff, don't use for real

Index: Benson.xs
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/Benson/Benson.xs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Benson.xs	2001/07/04 01:22:36	1.9
--- Benson.xs	2001/07/15 02:00:55	1.10
***************
*** 32,35 ****
--- 32,36 ----
  	string forwarder;
  	string port;
+ 	struct orb_connector *c;
  	CORBA::Object_var obj;
  	SV* self;
***************
*** 57,60 ****
--- 58,64 ----
  	try {
  		obj = bind_queue(forwarder.c_str());
+ 		if(CORBA::is_nil(obj)) {
+ 			throw;
+ 		}
  		Queue_var tm = Queue::_narrow(obj);
  		tm->submit(agent.c_str(),msg.c_str(),sev.c_str(),subsys.c_str());
***************
*** 82,85 ****
--- 86,90 ----
  	string forwarder;
  	string port;
+ 	struct orb_connector *c;
  	CORBA::Object_var obj;
  	SV* self;
***************
*** 128,131 ****
--- 133,137 ----
  	AV* arrayOfAlerts;
  	HV* hashedAlert;
+ 	struct orb_connector *c;
  	CORBA::Object_var obj;
  	SV* self;
***************
*** 146,151 ****
--- 152,161 ----
  	try {
  		obj = bind_queue(forwarder.c_str());
+ 		if(CORBA::is_nil(obj)) {
+ 			throw;
+ 		}
  		Queue_var tm = Queue::_narrow(obj);
  		alerts = tm->alert_list();
+ 		cerr << "CORBA just called alert_list" << endl;
  		for(CORBA::ULong idx = 0; idx < alerts->length(); idx++) {
  			Alert current;
***************
*** 176,179 ****
--- 186,190 ----
  				newRV_noinc((SV*)hashedAlert));
  		}
+ 		delete obj;
  	} catch (CORBA::Exception &e) {
  		cerr << "Benson::alert_list exception: " << e << endl;
***************
*** 197,200 ****
--- 208,212 ----
  	string forwarder;
  	string port;
+ 	struct orb_connector *c;
  	CORBA::Object_var obj;
  	SV* self;
***************
*** 238,241 ****
--- 250,254 ----
  	string forwarder;
  	string port;
+ 	struct orb_connector *c;
  	CORBA::Object_var obj;
  	SV* self;

Index: Queue_util.cc
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/Benson/Queue_util.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Queue_util.cc	2001/05/01 03:37:01	1.3
--- Queue_util.cc	2001/07/15 02:00:55	1.4
***************
*** 8,16 ****
   	fargv[fargc++] = (char*)forwarder;
  
! 	CORBA::ORB_var orb = CORBA::ORB_init(fargc,fargv,"mico-local-orb");
! 	CORBA::BOA_var boa = orb->BOA_init(fargc,fargv,"mico-local-boa");
  
  	assert(fargc == 2);
! 	CORBA::Object_var obj = orb->bind("IDL:newportal.com/Queue:1.0", fargv[1]);
  	if(CORBA::is_nil (obj)) {
  		except = "cannot bind to ";
--- 8,21 ----
   	fargv[fargc++] = (char*)forwarder;
  
! 	CORBA::ORB_var orb =
! 		CORBA::ORB_init(fargc,fargv,"mico-local-orb");
! 	CORBA::BOA_var boa =
! 		orb->BOA_init(fargc,fargv,"mico-local-boa");
  
  	assert(fargc == 2);
! 	CORBA::Object_var obj =
! 		orb->bind("IDL:newportal.com/Queue:1.0", fargv[1]);
! 	cerr << "CORBA binding object: " << obj << endl;   
! 	
  	if(CORBA::is_nil (obj)) {
  		except = "cannot bind to ";

[Benson-commit] CVS: benson2/src/modules/Handlers/lib/Benson/Handlers Monitor.pm,1.10,1.11

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/modules/Handlers/lib/Benson/Handlers
In directory usw-pr-cvs1:/tmp/cvs-serv24671/src/modules/Handlers/lib/Benson/Handlers

Modified Files:
	Monitor.pm 
Log Message:
This is somewhat experimental stuff, don't use for real

Index: Monitor.pm
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/Handlers/lib/Benson/Handlers/Monitor.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Monitor.pm	2001/06/17 20:35:35	1.10
--- Monitor.pm	2001/07/15 02:00:55	1.11
***************
*** 37,44 ****
  	$s->trace("Benson::Handlers::Monitor begins",1);
  
- 	my $queue = new Benson(forwarder => $s->Forwarder,
- 				port => $s->Port);
- 	$s->Queue($queue);
  	while(1) {
  		$s->trace("Starting monitoring loop",4);
  		eval {
--- 37,44 ----
  	$s->trace("Benson::Handlers::Monitor begins",1);
  
  	while(1) {
+ 		my $queue = new Benson(forwarder => $s->Forwarder,
+ 					port => $s->Port);
+ 		$s->Queue($queue);
  		$s->trace("Starting monitoring loop",4);
  		eval {
***************
*** 53,58 ****
  
  			$s->trace("4) sleeping ZZZzzzz...",4);
- 			sleep($s->LoopInterval);
  		}; print $@ if $@; 
  	}
  	return OK;
--- 53,60 ----
  
  			$s->trace("4) sleeping ZZZzzzz...",4);
  		}; print $@ if $@; 
+ 		undef $queue;
+ 		$s->Queue($queue);
+ 		sleep($s->LoopInterval);
  	}
  	return OK;
***************
*** 61,68 ****
  sub action_loop {
  	my ($queue,$s) = @_;
! 	my $array_ref = $queue->alert_list(forwarder => $s->Forwarder);
  	my @alerts = @{$array_ref};
  
- 	$s->trace("Action loop start...", 3);
  	for (my $current_alert=0;$current_alert<=$#alerts;$current_alert++) {		
  		my %alert = %{$alerts[$current_alert]};
--- 63,70 ----
  sub action_loop {
  	my ($queue,$s) = @_;
! 	$s->trace("Action loop start...", 3);
! 	my $array_ref = $queue->alert_list();
  	my @alerts = @{$array_ref};
  
  	for (my $current_alert=0;$current_alert<=$#alerts;$current_alert++) {		
  		my %alert = %{$alerts[$current_alert]};
***************
*** 83,87 ****
  			my $clean_aref = \@clean_alerts;
  
! 			my $trap_ref = new Benson::Alert ($s,$clean_aref);
  			$trap_ref->identity($alert{"identity"});
  			$trap_ref->agent($alert{"agent"});
--- 85,89 ----
  			my $clean_aref = \@clean_alerts;
  
! 			my $trap_ref = new Benson::Alert ($s);
  			$trap_ref->identity($alert{"identity"});
  			$trap_ref->agent($alert{"agent"});
***************
*** 98,107 ****
  				$s->trace("Calling action handler",2);
  				Benson::Handlers::Action::handler($trap_ref);				
! 				$queue->update_status(forwarder => $s->Forwarder,
! 							identity => $alert{"identity"},
  							status => "processed");
  			} else {
! 				$queue->update_status(forwarder => $s->Forwarder,
! 							identity => $alert{"identity"},
  							status => "acknowledge:suppress");
  			}
--- 100,107 ----
  				$s->trace("Calling action handler",2);
  				Benson::Handlers::Action::handler($trap_ref);				
! 				$queue->update_status(identity => $alert{"identity"},
  							status => "processed");
  			} else {
! 				$queue->update_status(identity => $alert{"identity"},
  							status => "acknowledge:suppress");
  			}
***************
*** 113,117 ****
  sub acknowledge_loop {
  	my ($queue,$s) = @_;
! 	my $array_ref = $queue->alert_list(forwarder => $s->Forwarder);
  	my @alerts = @{$array_ref};
  	$s->trace("Acknowledge loop start...", 3);
--- 113,117 ----
  sub acknowledge_loop {
  	my ($queue,$s) = @_;
! 	my $array_ref = $queue->alert_list();
  	my @alerts = @{$array_ref};
  	$s->trace("Acknowledge loop start...", 3);
***************
*** 136,141 ****
  				Benson::Handlers::Logger::handler($trap_ref);
  			}
! 			$queue->clear(forwarder => $s->Forwarder,
! 					identity => $alert{"identity"});
  			$s->log("Alert ".$alert{"identity"}." acknowledged.", 4);
  			$s->log("Alert ".$alert{"identity"}." acknowledged.", INFO);
--- 136,140 ----
  				Benson::Handlers::Logger::handler($trap_ref);
  			}
! 			$queue->clear(identity => $alert{"identity"});
  			$s->log("Alert ".$alert{"identity"}." acknowledged.", 4);
  			$s->log("Alert ".$alert{"identity"}." acknowledged.", INFO);
***************
*** 209,214 ****
  	# Check conditional
  	if($bad_thing eq "exists") {
! 		$queue->submit(forwarder => $s->Forwarder,
! 				agent => $s->Hostname,
  				severity => "GadZooks!",
  				subsystem => "tectonic plates",	
--- 208,212 ----
  	# Check conditional
  	if($bad_thing eq "exists") {
! 		$queue->submit(agent => $s->Hostname,
  				severity => "GadZooks!",
  				subsystem => "tectonic plates",	

[Benson-commit] CVS: benson2/src/modules/contrib/suppress S10simple.pm,1.6,1.7

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/modules/contrib/suppress
In directory usw-pr-cvs1:/tmp/cvs-serv24671/src/modules/contrib/suppress

Modified Files:
	S10simple.pm 
Log Message:
This is somewhat experimental stuff, don't use for real

Index: S10simple.pm
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/contrib/suppress/S10simple.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** S10simple.pm	2001/06/17 20:51:42	1.6
--- S10simple.pm	2001/07/15 02:00:56	1.7
***************
*** 7,19 ****
  	my ($self,$t) = @_;
  	my $s = $t->server;
- 	my $array_ref = $t->alertlist;
- 	my @alerts = @{$array_ref};
  	my ($curr_time,$curr_id) = split /\./, $t->identity;
  	my $queue = $s->Queue;
! 
  	$s->trace("S10simple suppression handler called", 2);
  
  	for(my $current_alert=0;$current_alert<=$#alerts; $current_alert++) {
  		my ($time,$id) = split /\./, $alert{"identity"};
  		my $total = 0;
  		my %alert = %{$alerts[$current_alert]};
--- 7,21 ----
  	my ($self,$t) = @_;
  	my $s = $t->server;
  	my ($curr_time,$curr_id) = split /\./, $t->identity;
  	my $queue = $s->Queue;
! 	my $array_ref = $queue->alert_list;
! 	my @alerts = @{$array_ref};
  	$s->trace("S10simple suppression handler called", 2);
  
  	for(my $current_alert=0;$current_alert<=$#alerts; $current_alert++) {
  		my ($time,$id) = split /\./, $alert{"identity"};
+ 		if($alerts{"identity"} eq $t->identity) {
+ 			next; # Skip our alert identity
+ 		}
  		my $total = 0;
  		my %alert = %{$alerts[$current_alert]};

[Benson-commit] CVS: benson2/src/modules/Server/lib/Benson Alert.pm,1.1.1.1,1.2 Server.pm,1.3,1.4

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/modules/Server/lib/Benson
In directory usw-pr-cvs1:/tmp/cvs-serv24671/src/modules/Server/lib/Benson

Modified Files:
	Alert.pm Server.pm 
Log Message:
This is somewhat experimental stuff, don't use for real

Index: Alert.pm
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/Server/lib/Benson/Alert.pm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Alert.pm	2001/03/23 03:13:29	1.1.1.1
--- Alert.pm	2001/07/15 02:00:56	1.2
***************
*** 8,13 ****
  	my ($server,$alerts) = @_;
  	my $self = {
! 		server => $server,
! 		alertlist => $alerts
  	};
  	bless $self, $class;
--- 8,12 ----
  	my ($server,$alerts) = @_;
  	my $self = {
! 		server => $server
  	};
  	bless $self, $class;

Index: Server.pm
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/Server/lib/Benson/Server.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Server.pm	2001/05/08 03:54:33	1.3
--- Server.pm	2001/07/15 02:00:56	1.4
***************
*** 15,22 ****
  sub BuildIdentity {
  	my $self = shift;
! 	my ($alert_list,$agent,$sev,$sub,$msg) = @_;
  	my $id = "";
  	my @words = split /\s+/, $msg;
- 	print $alert_list."\n";
  	$id .= time().".";
  	push @words, $agent;
--- 15,21 ----
  sub BuildIdentity {
  	my $self = shift;
! 	my ($agent,$sev,$sub,$msg) = @_;
  	my $id = "";
  	my @words = split /\s+/, $msg;
  	$id .= time().".";
  	push @words, $agent;

[Benson-commit] CVS: benson2/src/modules/contrib/rules R80escalate.pm,1.4,1.5 R90autoack.pm,1.6,1.7

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/modules/contrib/rules
In directory usw-pr-cvs1:/tmp/cvs-serv24671/src/modules/contrib/rules

Modified Files:
	R80escalate.pm R90autoack.pm 
Log Message:
This is somewhat experimental stuff, don't use for real

Index: R80escalate.pm
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/contrib/rules/R80escalate.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** R80escalate.pm	2001/06/17 20:35:36	1.4
--- R80escalate.pm	2001/07/15 02:00:56	1.5
***************
*** 11,15 ****
  	my ($self, $s) = @_;
  	my $queue = $s->Queue;
! 	$array = $queue->alert_list(forwarder => $s->Forwarder);
  	my @alerts = @{$array};
  	my $current_time = time();
--- 11,15 ----
  	my ($self, $s) = @_;
  	my $queue = $s->Queue;
! 	$array = $queue->alert_list();
  	my @alerts = @{$array};
  	my $current_time = time();

Index: R90autoack.pm
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/contrib/rules/R90autoack.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** R90autoack.pm	2001/06/17 20:35:36	1.6
--- R90autoack.pm	2001/07/15 02:00:56	1.7
***************
*** 12,16 ****
  	my $queue = $s->Queue;
  	$s->trace(" R90autoack is running...",3);
! 	$array_ref = $queue->alert_list(forwarder => $s->Forwarder);
  	my @alerts = @{$array_ref};
  	my $current_time = time();
--- 12,16 ----
  	my $queue = $s->Queue;
  	$s->trace(" R90autoack is running...",3);
! 	$array_ref = $queue->alert_list();
  	my @alerts = @{$array_ref};
  	my $current_time = time();

[Benson-commit] CVS: benson2/src/scripts benson.cfg.tmpl,1.7,1.8

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv22101/src/scripts

Modified Files:
	benson.cfg.tmpl 
Log Message:
Getting ready to fix some bugs

Index: benson.cfg.tmpl
===================================================================
RCS file: /cvsroot/benson/benson2/src/scripts/benson.cfg.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** benson.cfg.tmpl	2001/06/17 20:35:36	1.7
--- benson.cfg.tmpl	2001/07/14 21:29:21	1.8
***************
*** 48,55 ****
--- 48,62 ----
  
  #
+ # MaxAlertsPerMinute: <integer>
+ # Sets a cap on the number of alerts that can come into the alert system
+ #
+ MaxAlertsPerMinute 75
+ 
+ #
  # TraceLevel: <integer> (1-4)
  # Various levels of tracing 1 is lowest level 4 is highest
  #
  TraceLevel 1
+ 
  
  ####################################################

[Benson-commit] CVS: benson2 ChangeLog,1.12,1.13

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2
In directory usw-pr-cvs1:/tmp/cvs-serv22101

Modified Files:
	ChangeLog 
Log Message:
Getting ready to fix some bugs

Index: ChangeLog
===================================================================
RCS file: /cvsroot/benson/benson2/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** ChangeLog	2001/06/18 01:43:09	1.12
--- ChangeLog	2001/07/14 21:29:21	1.13
***************
*** 1,2 ****
--- 1,5 ----
+ version 2.0a13
+ - Bug fix for Benson.pm and Benson.xs
+ 
  version 2.0a12
  - Added skeleton for process monitor.

[Benson-commit] CVS: benson2/src/modules/Server/lib/Benson/Constants ErrorMesgs.pm,NONE,1.1

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/modules/Server/lib/Benson/Constants
In directory usw-pr-cvs1:/tmp/cvs-serv22101/src/modules/Server/lib/Benson/Constants

Added Files:
	ErrorMesgs.pm 
Log Message:
Getting ready to fix some bugs

--- NEW FILE: ErrorMesgs.pm ---
package Benson::Constants::ErrorMesgs;

require Exporter;
@ISA = qw(Exporter);


use constant BEN000 => "BEN-000 Success";
use constant BEN001 => "BEN-001 ";
use constant BEN002 => "BEN-002 ";

use constant BEN010 => "BEN-010 Permission Denied by Access Control Lists on gateway.";
use constant BEN011 => "BEN-011 Permission Denied by Operating System.";

use constant BEN100 => "BEN-100 Monitor Subsystem process has failed unexpectedly.";

use constant BEN200 => "BEN-200 Communication Subsystem process has failed unexpectedly."

@EXPORT = qw(BEN000 BEN001 BEN002 BEN010 BEN011 BEN100 BEN200);

1;

__END__

=head1 NAME

Benson::Constants::ErrorMesgs - Benson Error Message Constants

=head1 DESCRIPTION

These are mostly handler return constants. They currently are as follows:


=head1 SEE ALSO

perl(1)
Benson::Handlers

Benson Perl Architecture notes at C<http://benson.sourceforge.net/>

=head1 AUTHORS

Benson Constants written by:
Bob Tribit <bt...@ne...>

[Benson-commit] CVS: benson2/src/modules/Server/lib/Benson/Constants - New directory

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/modules/Server/lib/Benson/Constants
In directory usw-pr-cvs1:/tmp/cvs-serv21983/Constants

Log Message:
Directory /cvsroot/benson/benson2/src/modules/Server/lib/Benson/Constants added to the repository

[Benson-commit] CVS: benson2/src/modules/Benson Benson.pm,1.5,1.6 Benson.xs,1.8,1.9

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/modules/Benson
In directory usw-pr-cvs1:/tmp/cvs-serv6058

Modified Files:
	Benson.pm Benson.xs 
Log Message:
DOH! Fixed some bugs in Benson.pm and Benson.xs

Index: Benson.pm
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/Benson/Benson.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Benson.pm	2001/06/17 20:35:23	1.5
--- Benson.pm	2001/07/04 01:22:36	1.6
***************
*** 33,38 ****
  	my ($self) = shift;
  	my %args = @_;
! 	my $rc = $self->ack(forwarder => $args{forwarder},
! 			identity => $args{identity});
  	return $rc;
  }
--- 33,37 ----
  	my ($self) = shift;
  	my %args = @_;
! 	my $rc = $self->ack(identity => $args{identity});
  	return $rc;
  }
***************
*** 41,46 ****
  	my ($self) = shift;
  	my %args = @_;
! 	my $rc = $self->update_status(forwarder => $args{forwarder},
! 				identity => $args{identity},
  				status => "acknowledge:log");
  	return $rc;
--- 40,44 ----
  	my ($self) = shift;
  	my %args = @_;
! 	my $rc = $self->update_status(identity => $args{identity},
  				status => "acknowledge:log");
  	return $rc;

Index: Benson.xs
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/Benson/Benson.xs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** Benson.xs	2001/06/17 20:35:23	1.8
--- Benson.xs	2001/07/04 01:22:36	1.9
***************
*** 31,34 ****
--- 31,35 ----
  	string msg;
  	string forwarder;
+ 	string port;
  	CORBA::Object_var obj;
  	SV* self;
***************
*** 37,40 ****
--- 38,42 ----
  	self = newSVsv(ST(0));
  	forwarder = SvPVX(*hv_fetch((HV*)SvRV(self), "forwarder", 9, 0));
+ 	port = SvPVX(*hv_fetch((HV*)SvRV(self), "port", 4, 0));
  	for(ctr=1;ctr<items;ctr=ctr+2) {
  		if(!strcmp(SvPVX(ST(ctr)),"agent")) {
***************
*** 48,54 ****
  		} else if(!strcmp(SvPVX(ST(ctr)),"forwarder")) {
  			forwarder = SvPVX(ST(ctr+1));	
  		}
  	}
! 	forwarder = "inet:" + forwarder + ":9021";
  	try {
  		obj = bind_queue(forwarder.c_str());
--- 50,58 ----
  		} else if(!strcmp(SvPVX(ST(ctr)),"forwarder")) {
  			forwarder = SvPVX(ST(ctr+1));	
+ 		} else if(!strcmp(SvPVX(ST(ctr)),"port")) {
+ 			port = SvPVX(ST(ctr+1));	
  		}
  	}
! 	forwarder = "inet:" + forwarder + ":" + port;
  	try {
  		obj = bind_queue(forwarder.c_str());
***************
*** 77,80 ****
--- 81,85 ----
  	string id;
  	string forwarder;
+ 	string port;
  	CORBA::Object_var obj;
  	SV* self;
***************
*** 83,86 ****
--- 88,92 ----
  	self = newSVsv(ST(0));
  	forwarder = SvPVX(*hv_fetch((HV*)SvRV(self), "forwarder", 9, 0));
+ 	port = SvPVX(*hv_fetch((HV*)SvRV(self), "port", 4, 0));
  	for(ctr=1;ctr<items;ctr=ctr+2) {
  		if(!strcmp(SvPVX(ST(ctr)),"identity")) {
***************
*** 88,94 ****
  		} else if(!strcmp(SvPVX(ST(ctr)),"forwarder")) {
  			forwarder = SvPVX(ST(ctr+1));	
  		}
  	}
! 	forwarder = "inet:" + forwarder + ":9021";
  	try {
  		obj = bind_queue(forwarder.c_str());
--- 94,102 ----
  		} else if(!strcmp(SvPVX(ST(ctr)),"forwarder")) {
  			forwarder = SvPVX(ST(ctr+1));	
+ 		} else if(!strcmp(SvPVX(ST(ctr)),"port")) {
+ 			port = SvPVX(ST(ctr+1));	
  		}
  	}
! 	forwarder = "inet:" + forwarder + ":" + port;
  	try {
  		obj = bind_queue(forwarder.c_str());
***************
*** 116,119 ****
--- 124,128 ----
  	int ctr;
  	string forwarder;
+ 	string port;
  	TrapSeq_var alerts;
  	AV* arrayOfAlerts;
***************
*** 125,134 ****
  	self = newSVsv(ST(0));
  	forwarder = SvPVX(*hv_fetch((HV*)SvRV(self), "forwarder", 9, 0));
  	for(ctr=1;ctr<items;ctr=ctr+2) {
  		if(!strcmp(SvPVX(ST(ctr)),"forwarder")) {
  			forwarder = SvPVX(ST(ctr+1));	
  		}
  	}
! 	forwarder = "inet:" + forwarder + ":9021";
  	arrayOfAlerts = newAV();
  	try {
--- 134,146 ----
  	self = newSVsv(ST(0));
  	forwarder = SvPVX(*hv_fetch((HV*)SvRV(self), "forwarder", 9, 0));
+ 	port = SvPVX(*hv_fetch((HV*)SvRV(self), "port", 4, 0));
  	for(ctr=1;ctr<items;ctr=ctr+2) {
  		if(!strcmp(SvPVX(ST(ctr)),"forwarder")) {
  			forwarder = SvPVX(ST(ctr+1));	
+ 		} else if(!strcmp(SvPVX(ST(ctr)),"port")) {
+ 			port = SvPVX(ST(ctr+1));	
  		}
  	}
! 	forwarder = "inet:" + forwarder + ":" + port;
  	arrayOfAlerts = newAV();
  	try {
***************
*** 184,187 ****
--- 196,200 ----
  	string status;
  	string forwarder;
+ 	string port;
  	CORBA::Object_var obj;
  	SV* self;
***************
*** 190,193 ****
--- 203,207 ----
  	self = newSVsv(ST(0));
  	forwarder = SvPVX(*hv_fetch((HV*)SvRV(self), "forwarder", 9, 0));
+ 	port = SvPVX(*hv_fetch((HV*)SvRV(self), "port", 4, 0));
  	for(ctr=1;ctr<items;ctr=ctr+2) {
  		if(!strcmp(SvPVX(ST(ctr)),"identity")) {
***************
*** 195,203 ****
  		} else if(!strcmp(SvPVX(ST(ctr)),"forwarder")) {
  			forwarder = SvPVX(ST(ctr+1));	
  		} else if(!strcmp(SvPVX(ST(ctr)),"status")) {
  			status = SvPVX(ST(ctr+1));	
  		}
  	}
! 	forwarder = "inet:" + forwarder + ":9021";
  	try {
  		obj = bind_queue(forwarder.c_str());
--- 209,219 ----
  		} else if(!strcmp(SvPVX(ST(ctr)),"forwarder")) {
  			forwarder = SvPVX(ST(ctr+1));	
+ 		} else if(!strcmp(SvPVX(ST(ctr)),"port")) {
+ 			port = SvPVX(ST(ctr+1));	
  		} else if(!strcmp(SvPVX(ST(ctr)),"status")) {
  			status = SvPVX(ST(ctr+1));	
  		}
  	}
! 	forwarder = "inet:" + forwarder + ":" + port;
  	try {
  		obj = bind_queue(forwarder.c_str());
***************
*** 221,224 ****
--- 237,241 ----
  	string id;
  	string forwarder;
+ 	string port;
  	CORBA::Object_var obj;
  	SV* self;
***************
*** 227,230 ****
--- 244,248 ----
  	self = newSVsv(ST(0));
  	forwarder = SvPVX(*hv_fetch((HV*)SvRV(self), "forwarder", 9, 0));
+ 	port = SvPVX(*hv_fetch((HV*)SvRV(self), "port", 4, 0));
  	for(ctr=1;ctr<items;ctr=ctr+2) {
  		if(!strcmp(SvPVX(ST(ctr)),"identity")) {
***************
*** 232,238 ****
  		} else if(!strcmp(SvPVX(ST(ctr)),"forwarder")) {
  			forwarder = SvPVX(ST(ctr+1));	
  		}
  	}
! 	forwarder = "inet:" + forwarder + ":9021";
  	try {
  		obj = bind_queue(forwarder.c_str());
--- 250,258 ----
  		} else if(!strcmp(SvPVX(ST(ctr)),"forwarder")) {
  			forwarder = SvPVX(ST(ctr+1));	
+ 		} else if(!strcmp(SvPVX(ST(ctr)),"port")) {
+ 			port = SvPVX(ST(ctr+1));	
  		}
  	}
! 	forwarder = "inet:" + forwarder + ":" + port;
  	try {
  		obj = bind_queue(forwarder.c_str());

[Benson-commit] CVS: benson2 ChangeLog,1.11,1.12 INSTALL.quick,1.4,1.5 NEWS,1.2,1.3 TODO,1.3,1.4

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2
In directory usw-pr-cvs1:/tmp/cvs-serv16827

Modified Files:
	ChangeLog INSTALL.quick NEWS TODO 
Log Message:
Final update for the alpha12 release

Index: ChangeLog
===================================================================
RCS file: /cvsroot/benson/benson2/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** ChangeLog	2001/06/03 22:14:12	1.11
--- ChangeLog	2001/06/18 01:43:09	1.12
***************
*** 1,3 ****
--- 1,9 ----
+ version 2.0a12
+ - Added skeleton for process monitor.
+ - Fixed bugs in Benson.pm, Benson.xs is no longer using c++ classes.
+ - Benson attributes are now available for forwarder/port default.
+ 
  version 2.0a11
+ - Many changes to the autoconf stuff. Added debug and profiling support.
  
  version 2.0a10

Index: INSTALL.quick
===================================================================
RCS file: /cvsroot/benson/benson2/INSTALL.quick,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** INSTALL.quick	2001/04/28 16:45:50	1.4
--- INSTALL.quick	2001/06/18 01:43:09	1.5
***************
*** 1,10 ****
- lwp-download http://www.openssl.org/source/openssl-0.9.6.tar.gz
  lwp-download http://www.mico.org/mico-2.3.5.tar.gz
  lwp-download http://www.perl.com/CPAN-local/src/stable.tar.gz
  lwp-download http://prdownloads.sourceforge.net/benson/benson-2.0a3.tar.gz
- tar -zxvf openssl-0.9.6.tar.gz
  tar -zxvf mico-2.3.5.tar.gz
  tar -zxvf stable.tar.gz
! tar -zxvf benson-2.0a3.tar.gz
  cd openssl-0.9.6
  ./Config
--- 1,8 ----
  lwp-download http://www.mico.org/mico-2.3.5.tar.gz
  lwp-download http://www.perl.com/CPAN-local/src/stable.tar.gz
  lwp-download http://prdownloads.sourceforge.net/benson/benson-2.0a3.tar.gz
  tar -zxvf mico-2.3.5.tar.gz
  tar -zxvf stable.tar.gz
! tar -zxvf benson-2.0a12.tar.gz
  cd openssl-0.9.6
  ./Config

Index: NEWS
===================================================================
RCS file: /cvsroot/benson/benson2/NEWS,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** NEWS	2001/05/01 03:37:01	1.2
--- NEWS	2001/06/18 01:43:09	1.3
***************
*** 1,10 ****
! April
  --------
! Welcome Shawn Kelley and Richard Wallace to the Benson team. Richard
! Wallace is currently helping out on the *BSD and MacOS X port, as well as
! finding those embarassing bugs, i.e. the bensonctl not being
! portable. Shawn Kelley has been writing Benson up in front of Academia,
! and working on a Top process monitor module. Shawn has also volunteered to
! overhaul the website in his valuable spare time.
  
  Other items of note, are the latest alpha releases this month. Changes can
--- 1,6 ----
! June
  --------
! Getting back into the swing of things. Summer weather has been keeping me
! busy. Slowly, but surely I am getting the stuff I want into the CVS tree.
  
  Other items of note, are the latest alpha releases this month. Changes can
***************
*** 13,14 ****
--- 9,11 ----
  know how it works, or doesn't work for you. Let us know how you would like
  to see it made better.
+ 

Index: TODO
===================================================================
RCS file: /cvsroot/benson/benson2/TODO,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** TODO	2001/04/23 05:06:47	1.3
--- TODO	2001/06/18 01:43:09	1.4
***************
*** 7,11 ****
  ----------
  Build some generic monitors for the system
! 	- process monitor
  	- cpu monitor
  	- load monitor
--- 7,11 ----
  ----------
  Build some generic monitors for the system
! 	- process monitor (partially done)
  	- cpu monitor
  	- load monitor

[Benson-commit] CVS: benson2/src/scripts procmon.conf,NONE,1.1

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv3723

Added Files:
	procmon.conf 
Log Message:
Added process monitor configuration file

--- NEW FILE: procmon.conf ---
# Process Monitor Configuration File
#
# "process string"	"severity"	"subsystem"	"message"
########################################################################################
"/usr/sbin/inetd"	"fatal"		"operating system"	-

[Benson-commit] CVS: benson2/src/modules/contrib/monitor M10procmon.pm,NONE,1.1

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/modules/contrib/monitor
In directory usw-pr-cvs1:/tmp/cvs-serv13309/monitor

Added Files:
	M10procmon.pm 
Log Message:
Added skeleton for process monitor

--- NEW FILE: M10procmon.pm ---
package M10procmon;

use Benson::Constants;
use Benson;

sub interval {
	return 600;	# Every 10 minutes.
}

sub handler {
	my ($self, $s) = @_;
	my $queue = $s->Queue;
	my %config;
	$s->trace("M10procmon is running...", 3);
	open CONFIG, $s->ServerRoot."/etc/procmon.conf";
	while(<CONFIG>) {
		my $line = $_;
		if($line =~ m/^#/ || $line =~ m/^\s/) { next; }
#		$line =~ s/\*/\.\*/g;
	}
	close CONFIG;
	$s->trace("M10procmon has finished.", 3);
	return OK;
}

1;

[Benson-commit] CVS: benson2/src/modules/contrib/monitor M10diskmon.pm,1.2,1.3

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/modules/contrib/monitor
In directory usw-pr-cvs1:/tmp/cvs-serv8335/src/modules/contrib/monitor

Modified Files:
	M10diskmon.pm 
Log Message:
New interfaces, unvieled new bugs, fixed hopefully in this cut

Index: M10diskmon.pm
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/contrib/monitor/M10diskmon.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** M10diskmon.pm	2001/05/09 19:55:20	1.2
--- M10diskmon.pm	2001/06/17 20:51:42	1.3
***************
*** 10,14 ****
  sub handler {
  	my ($self, $s) = @_;
! 	my $queue = new Benson;
  	my %config;
  	$s->trace("M10diskmon is running...", 3);
--- 10,14 ----
  sub handler {
  	my ($self, $s) = @_;
! 	my $queue = $s->Queue;
  	my %config;
  	$s->trace("M10diskmon is running...", 3);

[Benson-commit] CVS: benson2/src/modules/contrib/suppress S10simple.pm,1.5,1.6

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/modules/contrib/suppress
In directory usw-pr-cvs1:/tmp/cvs-serv8335/src/modules/contrib/suppress

Modified Files:
	S10simple.pm 
Log Message:
New interfaces, unvieled new bugs, fixed hopefully in this cut

Index: S10simple.pm
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/contrib/suppress/S10simple.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** S10simple.pm	2001/05/30 03:21:57	1.5
--- S10simple.pm	2001/06/17 20:51:42	1.6
***************
*** 10,14 ****
  	my @alerts = @{$array_ref};
  	my ($curr_time,$curr_id) = split /\./, $t->identity;
! 	my $queue = new Benson;
  
  	$s->trace("S10simple suppression handler called", 2);
--- 10,14 ----
  	my @alerts = @{$array_ref};
  	my ($curr_time,$curr_id) = split /\./, $t->identity;
! 	my $queue = $s->Queue;
  
  	$s->trace("S10simple suppression handler called", 2);

[Benson-commit] CVS: benson2/src/scripts L20database.sql.postgres,NONE,1.1 benson.cfg.tmpl,1.6,1.7

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv5421/src/scripts

Modified Files:
	benson.cfg.tmpl 
Added Files:
	L20database.sql.postgres 
Log Message:
Major bug fixes, and some small feature enhancments, looking into the memory leak bug that crop'd up again.

--- NEW FILE: L20database.sql.postgres ---
create table alert_log (
	id		varchar(50),
	agent		varchar(255),
	severity	varchar(255),
	subsystem	varchar(255),
	status		varchar(255),
	message		varchar(1024),
	count		integer
);

Index: benson.cfg.tmpl
===================================================================
RCS file: /cvsroot/benson/benson2/src/scripts/benson.cfg.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** benson.cfg.tmpl	2001/06/05 01:47:56	1.6
--- benson.cfg.tmpl	2001/06/17 20:35:36	1.7
***************
*** 75,81 ****
  #DBIPassword benson
  
- 
- 
- 
  ####################################################
  # SSL Support (README.ssl for more information)    #
--- 75,78 ----

[Benson-commit] CVS: benson2/src/modules/contrib/rules R80escalate.pm,1.3,1.4 R90autoack.pm,1.5,1.6

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/modules/contrib/rules
In directory usw-pr-cvs1:/tmp/cvs-serv5421/src/modules/contrib/rules

Modified Files:
	R80escalate.pm R90autoack.pm 
Log Message:
Major bug fixes, and some small feature enhancments, looking into the memory leak bug that crop'd up again.

Index: R80escalate.pm
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/contrib/rules/R80escalate.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** R80escalate.pm	2001/05/30 03:21:57	1.3
--- R80escalate.pm	2001/06/17 20:35:36	1.4
***************
*** 10,15 ****
  sub handler {
  	my ($self, $s) = @_;
! 	my $queue = new Benson;
! 	print " R80escalate is running...\n";
  	$array = $queue->alert_list(forwarder => $s->Forwarder);
  	my @alerts = @{$array};
--- 10,14 ----
  sub handler {
  	my ($self, $s) = @_;
! 	my $queue = $s->Queue;
  	$array = $queue->alert_list(forwarder => $s->Forwarder);
  	my @alerts = @{$array};

Index: R90autoack.pm
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/contrib/rules/R90autoack.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** R90autoack.pm	2001/06/06 18:08:46	1.5
--- R90autoack.pm	2001/06/17 20:35:36	1.6
***************
*** 10,14 ****
  sub handler {
  	my ($self, $s) = @_;
! 	my $queue = new Benson;
  	$s->trace(" R90autoack is running...",3);
  	$array_ref = $queue->alert_list(forwarder => $s->Forwarder);
--- 10,14 ----
  sub handler {
  	my ($self, $s) = @_;
! 	my $queue = $s->Queue;
  	$s->trace(" R90autoack is running...",3);
  	$array_ref = $queue->alert_list(forwarder => $s->Forwarder);

[Benson-commit] CVS: benson2/src/modules/Handlers/lib/Benson/Handlers Monitor.pm,1.9,1.10

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson2/src/modules/Handlers/lib/Benson/Handlers
In directory usw-pr-cvs1:/tmp/cvs-serv5421/src/modules/Handlers/lib/Benson/Handlers

Modified Files:
	Monitor.pm 
Log Message:
Major bug fixes, and some small feature enhancments, looking into the memory leak bug that crop'd up again.

Index: Monitor.pm
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/Handlers/lib/Benson/Handlers/Monitor.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Monitor.pm	2001/06/01 17:30:26	1.9
--- Monitor.pm	2001/06/17 20:35:35	1.10
***************
*** 37,49 ****
  	$s->trace("Benson::Handlers::Monitor begins",1);
  
! 	my $queue = new Benson;
  	while(1) {
! 		action_loop($queue, $s);
! 
! 		acknowledge_loop($queue, $s);		
! 
! 		run_rules_monitor($s);
! 
! 		sleep($s->LoopInterval);
  	}
  	return OK;
--- 37,58 ----
  	$s->trace("Benson::Handlers::Monitor begins",1);
  
! 	my $queue = new Benson(forwarder => $s->Forwarder,
! 				port => $s->Port);
! 	$s->Queue($queue);
  	while(1) {
! 		$s->trace("Starting monitoring loop",4);
! 		eval {
! 			$s->trace("1) starting action sub-section",4);
! 			action_loop($queue, $s);
! 
! 			$s->trace("2) starting acknowledge sub-section",4);
! 			acknowledge_loop($queue, $s);		
! 
! 			$s->trace("3) starting rules sub-section",4);
! 			run_rules_monitor($s);
! 
! 			$s->trace("4) sleeping ZZZzzzz...",4);
! 			sleep($s->LoopInterval);
! 		}; print $@ if $@; 
  	}
  	return OK;
***************
*** 143,149 ****
--- 152,160 ----
  	my $d = new DirHandle $server_root."/lib/perl";	
  	if(defined $d) {
+ 		$s->trace("Monitors were found...",4);
  		while(defined($_ = $d->read)) {
  			my $file = $_;
  			if(rule_or_monitor($s,$file)) {
+ 				$s->trace("Processing monitor....$file",4);
  				my $pkg = clean_pkg($file);
  				eval { 
***************
*** 159,162 ****
--- 170,174 ----
  				}; $s->log($@,1) if $@;
  				undef $pkg;
+ 				$s->trace("Monitor processing for $file completed.",4);
  			}
  			undef $file;