Removed loading of now unused parameters.

tapeserver/castor/tape/tapeserver/daemon/TapeDaemonConfig.cpp

@@ -50,9 +50,6 @@ castor::tape::tapeserver::daemon::TapeDaemonConfig
   TapeDaemonConfig config;
   
   config.catalogueConfig = CatalogueConfig::createFromCastorConf(log);
-  config.cupvHost = castorConf.getConfEntString("UPV" , "HOST", log);
-  config.vdqmHost = castorConf.getConfEntString("VDQM", "HOST", log);
-  config.vmgrHost = castorConf.getConfEntString("VMGR", "HOST", log);
   config.objectStoreBackendPath = castorConf.getConfEntString("TapeServer", "ObjectStoreBackendPath", log);
   config.rmcPort = castorConf.getConfEntInt("RMC", "PORT",
     (unsigned short)RMC_PORT, log);
@@ -66,7 +63,6 @@ castor::tape::tapeserver::daemon::TapeDaemonConfig
     TAPESERVER_LABEL_PORT, log);
   config.internalPort = castorConf.getConfEntInt("TapeServer", "InternalPort",
     TAPESERVER_INTERNAL_PORT, log);
-  config.vdqmHosts = createVdqmHostsFromCastorConf(log, castorConf);
 
   config.dataTransfer = DataTransferConfig::createFromCastorConf(log);
   

tapeserver/castor/tape/tapeserver/daemon/TapeDaemonConfig.hpp

@@ -52,21 +52,6 @@ struct TapeDaemonConfig {
    */
   std::string objectStoreBackendPath;
 
-  /**
-   * The network name of the host on which the cupv daemon is running.
-   */
-  std::string cupvHost;
-
-  /**
-   * The network name of the host on which the vdqm daemon is running.
-   */
-  std::string vdqmHost;
-
-  /**
-   * The network name of the host on which the vmgr host is running.
-   */
-  std::string vmgrHost;
-
   /**
    * The TCP/IP port on which the rmcd daemon is listening.
    */
@@ -101,11 +86,6 @@ struct TapeDaemonConfig {
    */
   unsigned short internalPort;
 
-  /**
-   * The trusted vdqm hosts.
-   */
-  std::vector<std::string> vdqmHosts;
-
   /**
    * The configuration parameters required by a data-transfer session.
    */

tapeserver/castor/tape/tapeserver/daemon/TapeDaemonMain.cpp

@@ -101,15 +101,6 @@ static void logStartOfDaemon(castor::log::Logger &log, const int argc,
 //------------------------------------------------------------------------------
 static std::string argvToString(const int argc, const char *const *const argv);
 
-//------------------------------------------------------------------------------
-// Writes the specified vdqm hosts to the logging system.  These hosts
-// should have been parsed from the contents of the TapeServer:VdqmHosts
-// entry (if there is one) in the CASTOR configuration file
-// /etc/castor/castor.conf.
-//------------------------------------------------------------------------------
-static void logParsedTrustedVdqmHosts(castor::log::Logger &log,
-  const std::vector<std::string> &vdqmHosts);
-
 //------------------------------------------------------------------------------
 // Writes the specified TPCONFIG lines to the specified logging system.
 //
@@ -140,7 +131,6 @@ static int exceptionThrowingMain(const int argc, char **const argv,
   // Parse /etc/castor/castor.conf
   const tape::tapeserver::daemon::TapeDaemonConfig tapeDaemonConfig =
     tape::tapeserver::daemon::TapeDaemonConfig::createFromCastorConf(&log);
-  logParsedTrustedVdqmHosts(log, tapeDaemonConfig.vdqmHosts);
 
   // Parse /etc/castor/TPCONFIG
   const tape::tapeserver::daemon::TpconfigLines tpconfigLines =
@@ -206,26 +196,6 @@ static std::string argvToString(const int argc, const char *const *const argv) {
   return str;
 }
 
-//------------------------------------------------------------------------------
-// logParsedTrustedVdqmHosts
-//------------------------------------------------------------------------------
-static void logParsedTrustedVdqmHosts(castor::log::Logger &log,
-  const std::vector<std::string> &vdqmHosts) {
-  std::ostringstream oss;
-  for(std::vector<std::string>::const_iterator itor = vdqmHosts.begin();
-    itor != vdqmHosts.end(); itor++) {
-    if(itor != vdqmHosts.begin()) {
-      oss << " ";
-    }
-    oss << *itor;
-  }
-
-  castor::log::Param params[] = {
-    castor::log::Param("nbVdqmHosts", vdqmHosts.size()),
-    castor::log::Param("vdqmHosts", oss.str())};
-  log(LOG_INFO, "Parsed trusted vdqm hosts", params);
-}
-
 //------------------------------------------------------------------------------
 // logTpconfigLines
 //------------------------------------------------------------------------------