|
From: Bob T. <bt...@us...> - 2001-07-15 19:29:03
|
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;
}
|