Commit 2f217398 authored by Eric Cano's avatar Eric Cano
Browse files

Moved Castor.conf reading of XROOT PrivateKey to mother process to fix unit testing.

parent e1d444b1
......@@ -50,5 +50,6 @@ message ForkDataTransfer {
required uint32 diskthreadpoolsize = 22;
required uint32 rmcport = 23;
required string remotefileprotocol = 24;
required string xrootprivatekey = 25;
}
......@@ -204,8 +204,7 @@ castor::tape::tapeserver::daemon::Session::EndOfSessionAction
rrp,
lc,
m_castorConf.tapeserverdRemoteFileProtocol,
castor::common::CastorConfiguration::getConfig().
getConfEntString("XROOT", "PrivateKey", "/opt/xrootd/keys/key.pem"));
m_castorConf.xrootPrivateKey);
RecallTaskInjector rti(mm, trst, dwtp, m_clientProxy,
m_castorConf.tapebridgeBulkRequestRecallMaxFiles,
m_castorConf.tapebridgeBulkRequestRecallMaxBytes,lc);
......@@ -297,8 +296,7 @@ castor::tape::tapeserver::daemon::Session::EndOfSessionAction
m_castorConf.tapebridgeBulkRequestMigrationMaxBytes,
lc,
m_castorConf.tapeserverdRemoteFileProtocol,
castor::common::CastorConfiguration::getConfig().
getConfEntString("XROOT", "PrivateKey", "/opt/xrootd/keys/key.pem"));
m_castorConf.xrootPrivateKey);
MigrationTaskInjector mti(mm, drtp, twst, m_clientProxy,
m_castorConf.tapebridgeBulkRequestMigrationMaxBytes,
m_castorConf.tapebridgeBulkRequestMigrationMaxFiles,lc);
......
......@@ -93,6 +93,7 @@ namespace daemon {
// Additions for tapeserverd
uint32_t tapeserverdDiskThreads;
std::string tapeserverdRemoteFileProtocol;
std::string xrootPrivateKey;
};
/**
* Constructor.
......
......@@ -624,6 +624,7 @@ castor::tape::tapeserver::daemon::DataTransferSession::CastorConf
config.tapebridgeMaxFilesBeforeFlush = msg.maxfilesbeforeflush();
config.tapeserverdDiskThreads = msg.diskthreadpoolsize();
config.tapeserverdRemoteFileProtocol = msg.remotefileprotocol();
config.xrootPrivateKey = msg.xrootprivatekey();
return config;
}
......
......@@ -161,6 +161,8 @@ castor::messages::ForkDataTransfer
msg.set_rmcport(rmcPort);
msg.set_remotefileprotocol(
config.tapeserverdRemoteFileProtocol);
msg.set_xrootprivatekey(
config.xrootPrivateKey);
return msg;
}
......
......@@ -1088,6 +1088,8 @@ castor::tape::tapeserver::daemon::DataTransferSession::CastorConf
"RTCPD", "THREAD_POOL", (uint32_t)RTCPD_THREAD_POOL, &m_log);
castorConf.tapeserverdRemoteFileProtocol = config.getConfEntString(
"TAPESERVERD", "REMOTEFILEPROTOCOL", "RFIO", &m_log);
castorConf.xrootPrivateKey = config.getConfEntString(
"XROOT", "PRIVATEKEY", "/opt/xrootd/keys/key.pem", &m_log);
return castorConf;
}
Supports Markdown
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