diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IcePack/Client.cpp | 40 | ||||
| -rw-r--r-- | cpp/src/IcePack/ComponentDeployer.cpp | 296 | ||||
| -rw-r--r-- | cpp/src/IcePack/ComponentDeployer.h | 32 | ||||
| -rw-r--r-- | cpp/src/IcePack/Parser.cpp | 17 | ||||
| -rw-r--r-- | cpp/src/IcePack/ServerDeployer.cpp | 87 | ||||
| -rw-r--r-- | cpp/src/IcePack/ServiceDeployer.cpp | 4 |
6 files changed, 316 insertions, 160 deletions
diff --git a/cpp/src/IcePack/Client.cpp b/cpp/src/IcePack/Client.cpp index b4df0a15a1e..0b70eb9a98c 100644 --- a/cpp/src/IcePack/Client.cpp +++ b/cpp/src/IcePack/Client.cpp @@ -48,6 +48,39 @@ Client::usage() ; } +class AdminExceptionFactory : public Ice::UserExceptionFactory +{ +public: + + virtual void createAndThrow(const string& type) + { + if(type == "::IcePack::DeploymentException") + { + throw DeploymentException(); + } + else if(type == "::IcePack::ParserDeploymentException") + { + throw ParserDeploymentException(); + } + else if(type == "::IcePack::AdapterDeploymentException") + { + throw AdapterDeploymentException(); + } + else if(type == "::IcePack::OfferDeploymentException") + { + throw OfferDeploymentException(); + } + else if(type == "::IcePack::ServerDeploymentException") + { + throw ServerDeploymentException(); + } + } + + virtual void destroy() + { + } +}; + int Client::run(int argc, char* argv[]) { @@ -151,6 +184,13 @@ Client::run(int argc, char* argv[]) return EXIT_FAILURE; } + Ice::UserExceptionFactoryPtr factory = new AdminExceptionFactory; + communicator()->addUserExceptionFactory(factory, "::IcePack::DeploymentException"); + communicator()->addUserExceptionFactory(factory, "::IcePack::ParserDeploymentException"); + communicator()->addUserExceptionFactory(factory, "::IcePack::AdapterDeploymentException"); + communicator()->addUserExceptionFactory(factory, "::IcePack::ServerDeploymentException"); + communicator()->addUserExceptionFactory(factory, "::IcePack::OfferDeploymentException"); + ParserPtr parser = Parser::createParser(communicator(), admin); int status = EXIT_SUCCESS; diff --git a/cpp/src/IcePack/ComponentDeployer.cpp b/cpp/src/IcePack/ComponentDeployer.cpp index e3dfefaa288..36e9699a839 100644 --- a/cpp/src/IcePack/ComponentDeployer.cpp +++ b/cpp/src/IcePack/ComponentDeployer.cpp @@ -68,10 +68,8 @@ public: { if(mkdir(_name.c_str(), 0755) != 0) { - cerr << "Can't create directory: " << _name << endl; - - Ice::SystemException ex(__FILE__, __LINE__); - ex.error = getSystemErrno(); + DeploymentException ex; + ex.reason = "Couldn't create directory " + _name + ": " + strerror(getSystemErrno()); throw ex; } } @@ -89,55 +87,56 @@ public: // struct dirent **namelist; int n = ::scandir(_name.c_str(), &namelist, 0, alphasort); - if(n < 0) - { - Ice::SystemException ex(__FILE__, __LINE__); - ex.error = getSystemErrno(); - throw ex; - } - - Ice::StringSeq entries; - entries.reserve(n); - for(int i = 0; i < n; ++i) - { - string name = namelist[i]->d_name; - free(namelist[i]); - entries.push_back(_name + "/" + name); - } - free(namelist); - - for(Ice::StringSeq::iterator p = entries.begin(); p != entries.end(); ++p) + if(n > 0) { - struct stat buf; - - if(::stat(p->c_str(), &buf) != 0) + Ice::StringSeq entries; + entries.reserve(n); + for(int i = 0; i < n; ++i) { - if(errno != ENOENT) - { - Ice::SystemException ex(__FILE__, __LINE__); - ex.error = getSystemErrno(); - throw ex; - } + string name = namelist[i]->d_name; + free(namelist[i]); + entries.push_back(_name + "/" + name); } - else if(S_ISREG(buf.st_mode)) + free(namelist); + + for(Ice::StringSeq::iterator p = entries.begin(); p != entries.end(); ++p) { - if(unlink(p->c_str()) != 0) + struct stat buf; + + if(::stat(p->c_str(), &buf) != 0) { - Ice::SystemException ex(__FILE__, __LINE__); - ex.error = getSystemErrno(); - throw ex; + if(errno != ENOENT) + { + // + // TODO: log error + // + } + } + else if(S_ISREG(buf.st_mode)) + { + if(unlink(p->c_str()) != 0) + { + // + // TODO: log error + // + } } } } + else if(n < 0) + { + // + // TODO: something seems to be wrong if we can't scan + // the directory. Print a warning. + // + } } if(rmdir(_name.c_str()) != 0) { - cerr << "Can't remove directory: " << _name << endl; - - Ice::SystemException ex(__FILE__, __LINE__); - ex.error = getSystemErrno(); - throw ex; + // + // TODO: print a warning. + // } } @@ -159,7 +158,7 @@ class GenerateConfiguration : public Task string operator()(const Ice::PropertyDict::value_type& p) const { - return p.first + "=" + p.second; + return p.first + "=" + p.second; } }; @@ -178,8 +177,8 @@ public: configfile.open(_file.c_str(), ios::out); if(!configfile) { - cerr << "Can't create configuration file: " << _file << endl; - Ice::SystemException ex(__FILE__, __LINE__); + DeploymentException ex; + ex.reason = "Couldn't create configuration file: " + _file; throw ex; } @@ -193,11 +192,9 @@ public: { if(unlink(_file.c_str()) != 0) { - cerr << "Can't remove configuration file: " << _file << endl; - - Ice::SystemException ex(__FILE__, __LINE__); - ex.error = getSystemErrno(); - throw ex; + // + // TOTO: print a warning. + // } } @@ -224,12 +221,27 @@ public: virtual void deploy() { - _admin->add(_offer, _proxy); + try + { + _admin->add(_offer, _proxy); + } + catch(const Ice::LocalException& lex) + { + ostringstream os; + os << "Couldn't contact the yellow service: " << lex << endl; + + OfferDeploymentException ex; + ex.reason = os.str(); + ex.intf = _offer; + ex.proxy = _proxy; + throw ex; + } } virtual void undeploy() { + assert(_admin); try { _admin->remove(_offer, _proxy); @@ -253,6 +265,22 @@ private: } +IcePack::DeploySAXParseException::DeploySAXParseException(const string& msg, const Locator*const locator) + : SAXParseException(XMLString::transcode(msg.c_str()), *locator) +{ +} + +IcePack::ParserDeploymentWrapperException::ParserDeploymentWrapperException(const ParserDeploymentException& ex) + : _exception(ex) +{ +} + +void +IcePack::ParserDeploymentWrapperException::throwParserDeploymentException() const +{ + throw _exception; +} + IcePack::ComponentErrorHandler::ComponentErrorHandler(ComponentDeployer& deployer) : _deployer(deployer) { @@ -338,6 +366,14 @@ IcePack::ComponentDeployHandler::endElement(const XMLCh *const name) } } +void +IcePack::ComponentDeployHandler::setDocumentLocator(const Locator *const locator) +{ + _deployer.setDocumentLocator(locator); + + _locator = locator; +} + string IcePack::ComponentDeployHandler::getAttributeValue(const AttributeList& attrs, const string& name) const { @@ -347,8 +383,7 @@ IcePack::ComponentDeployHandler::getAttributeValue(const AttributeList& attrs, c if(value == 0) { - cerr << "Missing attribute '" << name << "'" << endl; - return ""; + throw DeploySAXParseException("Missing attribute '" + name + "'", _locator); } return _deployer.substitute(toString(value)); @@ -391,13 +426,26 @@ IcePack::ComponentDeployer::ComponentDeployer(const Ice::CommunicatorPtr& commun string serversPath = _communicator->getProperties()->getProperty("IcePack.Data"); assert(!serversPath.empty()); _variables["datadir"] = serversPath + (serversPath[serversPath.length() - 1] == '/' ? "" : "/") + "servers"; + + // + // TODO: Find a better way to bootstrap the yellow service. We + // need to set the locator on the proxy here, because the + // communicator doesn't have a default locator since it's the + // locator communicator... + // + Ice::ObjectPrx object = + _communicator->stringToProxy(_communicator->getProperties()->getProperty("IcePack.Yellow.Admin")); + if(object) + { + Ice::LocatorPrx locator = Ice::LocatorPrx::uncheckedCast( + _communicator->stringToProxy(_communicator->getProperties()->getProperty("Ice.Default.Locator"))); + _yellowAdmin = Yellow::AdminPrx::uncheckedCast(object->ice_locator(locator)); + } } void IcePack::ComponentDeployer::parse(const string& xmlFile, ComponentDeployHandler& handler) { - _error = 0; - // // Setup the base directory for this deploment descriptor to the // location of the desciptor file. @@ -414,30 +462,89 @@ IcePack::ComponentDeployer::parse(const string& xmlFile, ComponentDeployHandler& } SAXParser* parser = new SAXParser; - parser->setValidationScheme(SAXParser::Val_Never); - try { + parser->setValidationScheme(SAXParser::Val_Never); ComponentErrorHandler err(*this); parser->setDocumentHandler(&handler); parser->setErrorHandler(&err); parser->parse(xmlFile.c_str()); } + catch(const ParserDeploymentWrapperException& ex) + { + // + // Throw the exception wrapped in ex. + // + ex.throwParserDeploymentException(); + } + catch(const SAXParseException& e) + { + delete parser; + + ostringstream os; + os << xmlFile << ":" << e.getLineNumber() << ": " << toString(e.getMessage()); + + ParserDeploymentException ex; + ex.component = _variables["name"]; + ex.reason = os.str(); + throw ex; + } + catch(const SAXException& e) + { + delete parser; + + ostringstream os; + os << xmlFile << ": SAXException: " << toString(e.getMessage()); + + ParserDeploymentException ex; + ex.component = _variables["name"]; + ex.reason = os.str(); + throw ex; + } catch(const XMLException& e) { - cerr << "XMLException: " << toString(e.getMessage()) << endl; - _error++; + delete parser; + + ostringstream os; + os << xmlFile << ": XMLException: " << toString(e.getMessage()); + + ParserDeploymentException ex; + ex.component = _variables["name"]; + ex.reason = os.str(); + throw ex; + } + catch(...) + { + delete parser; + + ostringstream os; + os << xmlFile << ": UnknownException while parsing file."; + + ParserDeploymentException ex; + ex.component = _variables["name"]; + ex.reason = os.str(); + throw ex; } + int rc = parser->getErrorCount(); delete parser; - if(_error > 0 || rc > 0) + if(rc > 0) { - throw DeploymentException(); + ParserDeploymentException ex; + ex.component = _variables["name"]; + ex.reason = xmlFile + ": Parser returned non null error count"; + throw ex; } } void +IcePack::ComponentDeployer::setDocumentLocator(const Locator*const locator) +{ + _locator = locator; +} + +void IcePack::ComponentDeployer::deploy() { vector<TaskPtr>::iterator p; @@ -447,18 +554,12 @@ IcePack::ComponentDeployer::deploy() { (*p)->deploy(); } - catch(const DeploymentException& ex) + catch(DeploymentException& ex) { - cerr << "Deploy: " << ex << endl; + ex.component = _variables["name"]; undeployFrom(p); throw; } - catch(const Ice::SystemException& ex) - { - cerr << "Deploy: " << ex << endl; - undeployFrom(p); - throw DeploymentException();; - } } } @@ -474,15 +575,8 @@ IcePack::ComponentDeployer::undeploy() catch(const DeploymentException& ex) { // - // TODO: we probably need to log the failure to execute - // this task so that the use can take necessary steps to - // ensure it's correctly undeployed. + // TODO: Undeploy shouldn't raise exceptions. // - cerr << "Undeploy: " << ex << endl; - } - catch(const Ice::SystemException& ex) - { - cerr << "Undeploy: " << ex << endl; } } } @@ -513,41 +607,16 @@ IcePack::ComponentDeployer::addOffer(const string& offer, const string& adapter, { assert(!adapter.empty()); - Yellow::AdminPrx yellowAdmin; - try - { - // - // TODO: Find a better way to bootstrap the yellow service. We - // need to set the locator on the proxy here, because the - // communicator doesn't have a default locator since it's the - // locator communicator... - // - Ice::ObjectPrx object = _communicator->stringToProxy( - _communicator->getProperties()->getProperty("IcePack.Yellow.Admin")); - - if(!object) - { - cerr << "IcePack.Yellow.Admin is not set, can't register the offer '" << offer << "'" << endl; - _error++; - return; - } - - Ice::LocatorPrx locator = Ice::LocatorPrx::uncheckedCast( - _communicator->stringToProxy(_communicator->getProperties()->getProperty("Ice.Default.Locator"))); - - yellowAdmin = Yellow::AdminPrx::checkedCast(object->ice_locator(locator)); - } - catch(Ice::LocalException& ex) - { - cerr << "Couldn't contact the yellow service to register the offer '" << offer << "':\n" << ex << endl; - _error++; - return; + if(!_yellowAdmin) + { + string msg = "IcePack is not configured to deploy offers (IcePack.Yellow.Admin property is missing)"; + throw DeploySAXParseException (msg, _locator); } Ice::ObjectPrx object = _communicator->stringToProxy(identity + "@" + adapter); assert(object); - _tasks.push_back(new RegisterOffer(yellowAdmin, offer, object)); + _tasks.push_back(new RegisterOffer(_yellowAdmin, offer, object)); } void @@ -563,7 +632,6 @@ IcePack::ComponentDeployer::overrideBaseDir(const string& basedir) } } - // // Substitute variables with their values. // @@ -580,8 +648,7 @@ IcePack::ComponentDeployer::substitute(const string& v) const if(end == string::npos) { - cerr << "Malformed variable name in : " << value << endl; - break; // Throw instead? + throw DeploySAXParseException("Malformed variable name in the '" + value + "' value", _locator); } @@ -589,8 +656,7 @@ IcePack::ComponentDeployer::substitute(const string& v) const map<string, string>::const_iterator p = _variables.find(name); if(p == _variables.end()) { - cerr << "Unknown variable: " << name << endl; - break; // Throw instead? + throw DeploySAXParseException("Unknown variable name in the '" + value + "' value", _locator); } value.replace(beg, end - beg + 1, p->second); @@ -612,11 +678,9 @@ IcePack::ComponentDeployer::undeployFrom(vector<TaskPtr>::iterator p) } catch(DeploymentException& ex) { - cerr << "Undeploy: " << ex << endl; - } - catch(Ice::SystemException& ex) - { - cerr << "Undeploy: " << ex << endl; + // + // TODO: log error message this really shouldn't throw. + // } } } diff --git a/cpp/src/IcePack/ComponentDeployer.h b/cpp/src/IcePack/ComponentDeployer.h index 8ced5524fd8..c9e6ad07b16 100644 --- a/cpp/src/IcePack/ComponentDeployer.h +++ b/cpp/src/IcePack/ComponentDeployer.h @@ -12,6 +12,7 @@ #define ICE_PACK_COMPONENT_DEPLOYER_H #include <IceUtil/Shared.h> +#include <IcePack/Admin.h> #include <Yellow/Yellow.h> #include <sax/HandlerBase.hpp> @@ -37,6 +38,29 @@ void decRef(::IcePack::Task*); class ComponentDeployer; +class DeploySAXParseException : public SAXParseException +{ +public: + + DeploySAXParseException(const std::string&, const Locator*const locator); + +}; + +// +// A wrapper for ParserDeploymentException. +// +class ParserDeploymentWrapperException : public SAXException +{ +public: + + ParserDeploymentWrapperException(const ParserDeploymentException&); + void throwParserDeploymentException() const; + +private: + + ParserDeploymentException _exception; +}; + class ComponentErrorHandler : public ErrorHandler { public: @@ -66,7 +90,7 @@ public: virtual void ignorableWhitespace(const XMLCh *const, const unsigned int) { } virtual void processingInstruction(const XMLCh *const, const XMLCh *const) { } virtual void resetDocument() { } - virtual void setDocumentLocator(const Locator *const) { } + virtual void setDocumentLocator(const Locator *const); virtual void startDocument() { } virtual void endDocument() { } @@ -83,6 +107,7 @@ private: std::stack<std::string> _elements; std::string _adapter; + const Locator* _locator; ComponentDeployer& _deployer; }; @@ -96,6 +121,7 @@ public: virtual void undeploy(); void parse(const std::string&, ComponentDeployHandler&); + void setDocumentLocator(const Locator*const locator); std::string substitute(const std::string&) const; void createDirectory(const std::string&, bool = false); @@ -109,12 +135,14 @@ protected: void undeployFrom(std::vector<TaskPtr>::iterator); Ice::CommunicatorPtr _communicator; + Yellow::AdminPrx _yellowAdmin; Ice::PropertiesPtr _properties; std::map<std::string, std::string> _variables; std::vector<TaskPtr> _tasks; std::string _configFile; - int _error; + + const Locator* _locator; }; } diff --git a/cpp/src/IcePack/Parser.cpp b/cpp/src/IcePack/Parser.cpp index 8c37e45ac4b..245bb940d0c 100644 --- a/cpp/src/IcePack/Parser.cpp +++ b/cpp/src/IcePack/Parser.cpp @@ -61,9 +61,9 @@ void IcePack::Parser::addServer(const list<string>& args, const std::list<std::string>& adapters, const std::list<std::string>& options) { - if(args.size() < 2) + if(args.size() != 4) { - error("`server add' requires at least two arguments (type `help' for more info)"); + error("`server add' requires four arguments (type `help' for more info)"); return; } @@ -77,7 +77,18 @@ IcePack::Parser::addServer(const list<string>& args, const std::list<std::string string descriptor = *p++; _admin->addServer(name, path, ldpath, descriptor); - + } + catch(const ParserDeploymentException& ex) + { + ostringstream s; + s << ex << ": " << ex.component << ": " << ex.reason; + error(s.str()); + } + catch(const DeploymentException& ex) + { + ostringstream s; + s << ex << ": " << ex.component << ": " << ex.reason; + error(s.str()); } catch(const Exception& ex) { diff --git a/cpp/src/IcePack/ServerDeployer.cpp b/cpp/src/IcePack/ServerDeployer.cpp index 2f79d26c572..608d39c697d 100644 --- a/cpp/src/IcePack/ServerDeployer.cpp +++ b/cpp/src/IcePack/ServerDeployer.cpp @@ -40,9 +40,22 @@ public: { AdapterPrx adapter = _manager->create(_desc); } - catch(const AdapterExistsException&) + catch(const AdapterExistsException& ex) { - throw DeploymentException(); + AdapterDeploymentException ex; + ex.adapter = _desc.name; + ex.reason = "Adapter already exist"; + throw ex; + } + catch(const Ice::LocalException& lex) + { + ostringstream os; + os << "Couldn't contact the adpater manager: " << lex << endl; + + AdapterDeploymentException ex; + ex.adapter = _desc.name; + ex.reason = os.str(); + throw ex; } } @@ -233,7 +246,17 @@ IcePack::ServerDeployer::deploy() { ComponentDeployer::deploy(); - _serverManager->create(_description); + try + { + _serverManager->create(_description); + } + catch(const ServerExistsException& ex) + { + ServerDeploymentException ex1; + ex1.server = _variables["name"]; + ex1.reason = "Server already exists"; + throw ex1; + } } void @@ -249,16 +272,12 @@ IcePack::ServerDeployer::setClassName(const string& name) { if(_kind != ServerKindJavaServer) { - cerr << "Class name element only allowed for Java servers." << endl; - _error++; - return; + throw DeploySAXParseException("classname element only allowed for Java servers", _locator); } if(name.empty()) { - cerr << "Empty path." << endl; - _error++; - return; + throw DeploySAXParseException("Empty classname element value", _locator); } _className = name; @@ -269,9 +288,7 @@ IcePack::ServerDeployer::setWorkingDirectory(const string& pwd) { if(pwd.empty()) { - cerr << "Empty working directory." << endl; - _error++; - return; + throw DeploySAXParseException("Empty working directory", _locator); } _description.pwd = pwd; @@ -282,21 +299,18 @@ IcePack::ServerDeployer::addAdapter(const string& name, const string& endpoints) { if(!_adapterManager) { - cerr << "Adapter manager not set, can't register the adapter '" << name << "'" << endl; - _error++; - return; + throw DeploySAXParseException("IcePack is not configured to deploy adapters", _locator); + } + + if(name.empty()) + { + throw DeploySAXParseException("Empty adapter name", _locator); } AdapterDescription desc; desc.name = name; desc.server = ServerPrx::uncheckedCast( _communicator->stringToProxy("server/" + _description.name + "@IcePack.Internal")); - if(desc.name == "") - { - cerr << "Empty adapter name." << endl; - _error++; - return; - } _tasks.push_back(new AddAdapterTask(_adapterManager, desc)); @@ -313,16 +327,16 @@ IcePack::ServerDeployer::addService(const string& name, const string& descriptor { if(_kind != ServerKindCppIceBox && _kind != ServerKindJavaIceBox) { - cerr << "Service elements are only allowed for Java or C++ IceBox servers." << endl; - _error++; - return; + throw DeploySAXParseException("Service are only allows in IceBox servers", _locator); } - if(name.empty() || descriptor.empty()) + if(name.empty()) + { + throw DeploySAXParseException("Name attribute value is empty", _locator); + } + if(descriptor.empty()) { - cerr << "Name or descriptor attribute value is empty in service element." << endl; - _error++; - return; + throw DeploySAXParseException("Descriptor attribute value is empty", _locator); } // @@ -337,12 +351,15 @@ IcePack::ServerDeployer::addService(const string& name, const string& descriptor string xmlFile = descriptor[0] != '/' ? _variables["basedir"] + "/" + descriptor : descriptor; task->parse(xmlFile); } - catch(const DeploymentException&) + catch(const ParserDeploymentException& ex) { - cerr << "Failed to parse the service '" << name << "' descriptor" << endl; - delete task; - _error++; - return; + // + // Add component and wrap the exception in a + // ParserDeploymentWrapperException. + // + ParserDeploymentException ex1(ex); + ex1.component = _variables["name"] + ":" + ex.component; + throw ParserDeploymentWrapperException(ex1); } _tasks.push_back(task); @@ -368,9 +385,7 @@ IcePack::ServerDeployer::setKind(ServerDeployer::ServerKind kind) case ServerKindCppServer: if(_description.path.empty()) { - cerr << "C++ server path is not specified" << endl; - _error++; - break; + throw DeploySAXParseException("C++ server path is not specified", _locator); } case ServerKindJavaServer: diff --git a/cpp/src/IcePack/ServiceDeployer.cpp b/cpp/src/IcePack/ServiceDeployer.cpp index 523e4f1324b..817799f6b1d 100644 --- a/cpp/src/IcePack/ServiceDeployer.cpp +++ b/cpp/src/IcePack/ServiceDeployer.cpp @@ -131,9 +131,7 @@ IcePack::ServiceDeployer::setDBEnv(const string& dir) { if(_kind != ServiceKindFreeze) { - cerr << "Database environment is only allowed for Freeze services." << endl; - _error++; - return; + throw DeploySAXParseException("Database environment is only allowed for Freeze services", _locator); } string path; |