Commit 58caa378 authored by Volodymyr Yurchenko's avatar Volodymyr Yurchenko
Browse files

Use credentials manager in ForceRestart()

parent e9bb196a
......@@ -35,7 +35,6 @@ struct lws_context_creation_info;
class TJAlienConnectionManager {
private:
std::string homedir; // local home directory
const int default_WSport = 8097;
const std::string default_server = DEFAULT_JCENTRAL_SERVER;
......
......@@ -404,13 +404,7 @@ void TJAlienConnectionManager::ForceRestart()
if (context)
lws_context_destroy(context);
std::string usercert = sUsercert.Data()[0] != '\0' ? sUsercert.Data() : homedir + "/.globus/usercert.pem";
std::string userkey = sUserkey.Data()[0] != '\0' ? sUserkey.Data() : homedir + "/.globus/userkey.pem";
std::string usercertpath = std::getenv("X509_USER_CERT") ? : usercert.c_str();
std::string userkeypath = std::getenv("X509_USER_KEY") ? : userkey.c_str();
TJAlienCredentialsObject co(usercertpath, userkeypath);
ConnectJCentral(co);
ConnectJCentral(creds.get(cFULL_GRID_CERT));
if (!IsConnected())
{
Info("TJAlienConnectionManager", "Failed to establish the connection to the server");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment