|
From: Bob T. <bt...@us...> - 2001-07-28 01:41:46
|
Update of /cvsroot/benson/benson2/src/modules/Benson
In directory usw-pr-cvs1:/tmp/cvs-serv22237
Modified Files:
Benson.pm Queue_util.cc
Log Message:
Updated the documentation and protected the higher C++ calls, in Benson.pm
Index: Benson.pm
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/Benson/Benson.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Benson.pm 2001/07/04 01:22:36 1.6
--- Benson.pm 2001/07/28 01:41:42 1.7
***************
*** 33,37 ****
my ($self) = shift;
my %args = @_;
! my $rc = $self->ack(identity => $args{identity});
return $rc;
}
--- 33,55 ----
my ($self) = shift;
my %args = @_;
! my $rc;
! my $require = 0;
!
! foreach my $param (keys %args) {
! if($param eq "forwarder") {
! $self->{forwarder} = $args{forwarder};
! }
! if($param eq "identity") {
! if(defined $args{identity}) {
! $required = 1;
! }
! }
! }
!
! if($required) {
! $rc = $self->ack(identity => $args{identity});
! } else {
! die "Usage: Benson::clear(identity => \"value\")\n";
! }
return $rc;
}
***************
*** 40,45 ****
my ($self) = shift;
my %args = @_;
! my $rc = $self->update_status(identity => $args{identity},
status => "acknowledge:log");
return $rc;
}
--- 58,81 ----
my ($self) = shift;
my %args = @_;
! my $rc;
! my $required = 0;
!
! foreach my $param (keys %args) {
! if($param eq "forwarder") {
! $self->{forwarder} = $args{forwarder};
! }
! if($param eq "identity") {
! if(defined $args{identity}) {
! $required = 1;
! }
! }
! }
!
! if($required) {
! $rc = $self->update_status(identity => $args{identity},
status => "acknowledge:log");
+ } else {
+ die "Usage: Benson::acknowledge(identity => \"value\")\n";
+ }
return $rc;
}
***************
*** 63,76 ****
modules, that are yet to be defined.
=head1 API USAGE
use Benson;
! my $queue = new Benson;
=head1 SUBMIT
! $queue->submit(forwarder => "collector.company.com",
! agent => "agent.company.com",
severity => "warning",
subsystem => "filesystem",
--- 99,116 ----
modules, that are yet to be defined.
+ NOTE: The forwarder hash key is now optional (vs. required) for the
+ submit, acknowledge, alert_list, acknowledge, update_status, and
+ increment_count methods.
+
=head1 API USAGE
use Benson;
! my $queue = new Benson(forwarder => "collector.company.com",
! port => "9021);
=head1 SUBMIT
! $queue->submit(agent => "agent.company.com",
severity => "warning",
subsystem => "filesystem",
Index: Queue_util.cc
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/Benson/Queue_util.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Queue_util.cc 2001/07/15 02:00:55 1.4
--- Queue_util.cc 2001/07/28 01:41:42 1.5
***************
*** 16,20 ****
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)) {
--- 16,19 ----
|