Menu
▾
▴
[Benson-commit] CVS: benson2/src/modules/Benson Benson.pm,1.5,1.6 Benson.xs,1.8,1.9
|
From: Bob T. <bt...@us...> - 2001-07-04 01:22:39
|
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());
|
