summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/ServerI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
-rw-r--r--cpp/src/IceGrid/ServerI.cpp121
1 files changed, 43 insertions, 78 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index dd06b2932b7..f087054f643 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -49,7 +49,7 @@ chownRecursive(const string& path, uid_t uid, gid_t gid)
DIR* d;
if((d = opendir(path.c_str())) == 0)
{
- throw "cannot read directory `" + path + "':\n" + IceUtilInternal::lastErrorToString();
+ throw runtime_error("cannot read directory `" + path + "':\n" + IceUtilInternal::lastErrorToString());
}
struct dirent* entry;
@@ -66,7 +66,7 @@ chownRecursive(const string& path, uid_t uid, gid_t gid)
if(closedir(d))
{
- throw "cannot read directory `" + path + "':\n" + IceUtilInternal::lastErrorToString();
+ throw runtime_error("cannot read directory `" + path + "':\n" + IceUtilInternal::lastErrorToString());
}
for(size_t i = 0; i < namelist.size(); ++i)
@@ -78,7 +78,7 @@ chownRecursive(const string& path, uid_t uid, gid_t gid)
{
if(chown(path.c_str(), uid, gid) != 0)
{
- throw "can't change permissions on `" + name + "':\n" + IceUtilInternal::lastErrorToString();
+ throw runtime_error("can't change permissions on `" + name + "':\n" + IceUtilInternal::lastErrorToString());
}
}
else if(name != "..")
@@ -88,7 +88,7 @@ chownRecursive(const string& path, uid_t uid, gid_t gid)
IceUtilInternal::structstat buf;
if(IceUtilInternal::stat(name, &buf) == -1)
{
- throw "cannot stat `" + name + "':\n" + IceUtilInternal::lastErrorToString();
+ throw runtime_error("cannot stat `" + name + "':\n" + IceUtilInternal::lastErrorToString());
}
if(S_ISDIR(buf.st_mode))
@@ -99,7 +99,7 @@ chownRecursive(const string& path, uid_t uid, gid_t gid)
{
if(chown(name.c_str(), uid, gid) != 0)
{
- throw "can't change permissions on `" + name + "':\n" + IceUtilInternal::lastErrorToString();
+ throw runtime_error("can't change permissions on `" + name + "':\n" + IceUtilInternal::lastErrorToString());
}
}
}
@@ -1353,19 +1353,9 @@ ServerI::checkUpdate(const InternalServerDescriptorPtr& desc, bool noRestart, co
{
checkAndUpdateUser(desc, false); // false = don't update the user, just check.
}
- catch(const Ice::Exception& ex)
- {
- ostringstream os;
- os << ex;
- throw DeploymentException(os.str());
- }
- catch(const string& msg)
+ catch(const exception& ex)
{
- throw DeploymentException(msg);
- }
- catch(const char* msg)
- {
- throw DeploymentException(msg);
+ throw DeploymentException(ex.what());
}
return StopCommand::isStopped(_state);
@@ -1477,10 +1467,10 @@ ServerI::finishPatch()
{
chownRecursive(_serverDir + "/distrib", _uid, _gid);
}
- catch(const string& msg)
+ catch(const exception& ex)
{
Ice::Warning out(_node->getTraceLevels()->logger);
- out << msg;
+ out << ex.what();
}
}
#endif
@@ -1555,9 +1545,7 @@ ServerI::checkDestroyed() const
{
if(_state == Destroyed)
{
- Ice::ObjectNotExistException ex(__FILE__, __LINE__);
- ex.id = _this->ice_getIdentity();
- throw ex;
+ throw Ice::ObjectNotExistException(__FILE__, __LINE__, _this->ice_getIdentity(), "", "");
}
}
@@ -1647,7 +1635,7 @@ ServerI::activate()
if(_activation == Disabled)
{
- throw string("The server is disabled.");
+ throw runtime_error("The server is disabled.");
}
//
@@ -1749,19 +1737,17 @@ ServerI::activate()
}
return;
}
- catch(const std::string& ex)
- {
- failure = ex;
- }
catch(const Ice::Exception& ex)
{
Ice::Warning out(_node->getTraceLevels()->logger);
out << "activation failed for server `" << _id << "':\n";
out << ex;
- ostringstream os;
- os << ex;
- failure = os.str();
+ failure = ex.what();
+ }
+ catch(const std::exception& ex)
+ {
+ failure = ex.what();
}
{
@@ -1890,12 +1876,12 @@ ServerI::destroy()
{
IcePatch2Internal::removeRecursive(_serverDir);
}
- catch(const string& msg)
+ catch(const exception& ex)
{
if(!_destroy->loadFailure())
{
Ice::Warning out(_node->getTraceLevels()->logger);
- out << "removing server directory `" << _serverDir << "' failed:\n" << msg;
+ out << "removing server directory `" << _serverDir << "' failed:\n" << ex.what();
}
}
}
@@ -2050,7 +2036,7 @@ ServerI::update()
{
IcePatch2Internal::removeRecursive(_serverDir);
}
- catch(const string&)
+ catch(const exception&)
{
}
}
@@ -2059,19 +2045,9 @@ ServerI::update()
{
updateImpl(_load->getInternalServerDescriptor());
}
- catch(const Ice::Exception& ex)
- {
- ostringstream os;
- os << ex;
- throw DeploymentException(os.str());
- }
- catch(const string& msg)
+ catch(const exception& ex)
{
- throw DeploymentException(msg);
- }
- catch(const char* msg)
- {
- throw DeploymentException(msg);
+ throw DeploymentException(ex.what());
}
if(oldDescriptor)
@@ -2116,15 +2092,10 @@ ServerI::update()
Ice::Warning out(_node->getTraceLevels()->logger);
out << "update failed:\n" << ex.reason << "\nand couldn't rollback old descriptor:\n" << e;
}
- catch(const string& msg)
- {
- Ice::Warning out(_node->getTraceLevels()->logger);
- out << "update failed:\n" << ex.reason << "\nand couldn't rollback old descriptor:\n" << msg;
- }
- catch(const char* msg)
+ catch(const exception& e)
{
Ice::Warning out(_node->getTraceLevels()->logger);
- out << "update failed:\n" << ex.reason << "\nand couldn't rollback old descriptor:\n" << msg;
+ out << "update failed:\n" << ex.reason << "\nand couldn't rollback old descriptor:\n" << e.what();
}
}
else if(!_destroy)
@@ -2327,7 +2298,7 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor)
ofstream configfile(IceUtilInternal::streamFilename(configFilePath).c_str()); // configFilePath is a UTF-8 string
if(!configfile.good())
{
- throw "couldn't create configuration file: " + configFilePath;
+ throw runtime_error("couldn't create configuration file: " + configFilePath);
}
configfile << "# Configuration file (" << IceUtil::Time::now().toDateTime() << ")" << endl << endl;
for(PropertyDescriptorSeq::const_iterator r = p->second.begin(); r != p->second.end(); ++r)
@@ -2359,10 +2330,10 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor)
{
IcePatch2Internal::remove(_serverDir + "/config/" + *q);
}
- catch(const string& msg)
+ catch(const exception& ex)
{
Ice::Warning out(_node->getTraceLevels()->logger);
- out << "couldn't remove file `" + _serverDir + "/config/" + *q + "':\n" + msg;
+ out << "couldn't remove file `" << _serverDir << "/config/" << *q << "':\n" << ex.what();
}
}
}
@@ -2401,10 +2372,10 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor)
{
IcePatch2Internal::removeRecursive(_serverDir + "/" + *p);
}
- catch(const string& msg)
+ catch(const exception& ex)
{
Ice::Warning out(_node->getTraceLevels()->logger);
- out << "couldn't remove directory `" + _serverDir + "/" + *p + "':\n" + msg;
+ out << "couldn't remove directory `" << _serverDir << "/" << *p << "':\n" << ex.what();
}
}
}
@@ -2429,7 +2400,7 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor)
ofstream configfile(IceUtilInternal::streamFilename(file).c_str()); // file is a UTF-8 string
if(!configfile.good())
{
- throw "couldn't create configuration file `" + file + "'";
+ throw runtime_error("couldn't create configuration file `" + file + "'");
}
for(PropertyDescriptorSeq::const_iterator p = (*q)->properties.begin();
@@ -2462,10 +2433,10 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor)
{
IcePatch2Internal::removeRecursive(_serverDir + "/dbs/" + *p);
}
- catch(const string& msg)
+ catch(const exception& ex)
{
Ice::Warning out(_node->getTraceLevels()->logger);
- out << "couldn't remove directory `" + _serverDir + "/dbs/" + *p + "':\n" + msg;
+ out << "couldn't remove directory `" << _serverDir << "/dbs/" << *p << "':\n" << ex.what();
}
}
}
@@ -2515,16 +2486,14 @@ ServerI::checkRevision(const string& replicaName, const string& uuid, int revisi
if(uuid != descUUID)
{
- DeploymentException ex;
- ex.reason = "server from replica `" + replicaName + "' is from another application (`" + uuid + "')";
- throw ex;
+ throw DeploymentException("server from replica `" + replicaName + "' is from another application (`" + uuid +
+ "')");
}
else if(revision != descRevision)
{
ostringstream os;
- os << "server from replica `" + replicaName + "' has a different version:\n";
- os << "current revision: " << descRevision << "\n";
- os << "replica revision: " << revision;
+ os << "server from replica `" << replicaName << "' has a different version:\n"
+ << "current revision: " << descRevision << "\nreplica revision: " << revision;
throw DeploymentException(os.str());
}
}
@@ -2594,13 +2563,13 @@ ServerI::checkAndUpdateUser(const InternalServerDescriptorPtr& desc, bool /*upda
}
catch(const UserAccountNotFoundException&)
{
- throw "couldn't find user account for user `" + user + "'";
+ throw runtime_error("couldn't find user account for user `" + user + "'");
}
catch(const Ice::LocalException& ex)
{
ostringstream os;
os << "unexpected exception while trying to find user account for user `" << user << "':\n" << ex;
- throw os.str();
+ throw runtime_error(os.str());
}
}
@@ -2623,13 +2592,11 @@ ServerI::checkAndUpdateUser(const InternalServerDescriptorPtr& desc, bool /*upda
}
if(!success)
{
- Ice::SyscallException ex(__FILE__, __LINE__);
- ex.error = IceInternal::getSystemErrno();
- throw ex;
+ throw Ice::SyscallException(__FILE__, __LINE__, IceInternal::getSystemErrno());
}
if(user != string(&buf[0]))
{
- throw "couldn't load server under user account `" + user + "': feature not supported on Windows";
+ throw runtime_error("couldn't load server under user account `" + user + "': feature not supported on Windows");
}
}
#else
@@ -2646,13 +2613,11 @@ ServerI::checkAndUpdateUser(const InternalServerDescriptorPtr& desc, bool /*upda
}
if(err != 0)
{
- Ice::SyscallException ex(__FILE__, __LINE__);
- ex.error = err;
- throw ex;
+ throw Ice::SyscallException(__FILE__, __LINE__, err);
}
else if(pw == 0)
{
- throw "unknown user account `" + user + "'";
+ throw runtime_error("unknown user account `" + user + "'");
}
//
@@ -2663,13 +2628,13 @@ ServerI::checkAndUpdateUser(const InternalServerDescriptorPtr& desc, bool /*upda
//
if(uid != 0 && pw->pw_uid != uid)
{
- throw "node has insufficient privileges to load server under user account `" + user + "'";
+ throw runtime_error("node has insufficient privileges to load server under user account `" + user + "'");
}
if(pw->pw_uid == 0 &&
_node->getCommunicator()->getProperties()->getPropertyAsInt("IceGrid.Node.AllowRunningServersAsRoot") <= 0)
{
- throw "running server as `root' is not allowed";
+ throw runtime_error("running server as `root' is not allowed");
}
if(update)
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 00:45:44 +0000