From 485a123f8a1a98ca748e4fca28441d7284a7908b Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Tue, 19 Dec 2017 15:38:50 +0100
Subject: [PATCH] Removed LabelSessionConfig::createFromCastorConf()
---
.../tapeserver/daemon/LabelSessionConfig.cpp | 22 -------------------
.../tapeserver/daemon/LabelSessionConfig.hpp | 10 ---------
2 files changed, 32 deletions(-)
diff --git a/tapeserver/castor/tape/tapeserver/daemon/LabelSessionConfig.cpp b/tapeserver/castor/tape/tapeserver/daemon/LabelSessionConfig.cpp
index 0e1618cd99..c797b4228b 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/LabelSessionConfig.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/LabelSessionConfig.cpp
@@ -31,25 +31,3 @@ castor::tape::tapeserver::daemon::LabelSessionConfig::LabelSessionConfig()
throw():
useLbp(false) {
}
-
-//------------------------------------------------------------------------------
-// createFromCastorConf
-//------------------------------------------------------------------------------
-castor::tape::tapeserver::daemon::LabelSessionConfig
- castor::tape::tapeserver::daemon::LabelSessionConfig::createFromCastorConf(
- cta::log::Logger *const log) {
- common::CastorConfiguration &castorConf =
- common::CastorConfiguration::getConfig();
- LabelSessionConfig config;
-
- const std::string useLBP = castorConf.getConfEntString(
- "TapeServer", "UseLogicalBlockProtection", "no");
-
- if (!strcasecmp(useLBP.c_str(), "yes") || !strcmp(useLBP.c_str(), "1")) {
- config.useLbp = true;
- } else {
- config.useLbp = false;
- }
-
- return config;
-}
diff --git a/tapeserver/castor/tape/tapeserver/daemon/LabelSessionConfig.hpp b/tapeserver/castor/tape/tapeserver/daemon/LabelSessionConfig.hpp
index a2c1d41f5d..d7b590e3ab 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/LabelSessionConfig.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/LabelSessionConfig.hpp
@@ -49,16 +49,6 @@ struct LabelSessionConfig {
*/
LabelSessionConfig() throw();
- /**
- * Returns a configuration structure based on the contents of
- * /etc/castor/castor.conf and compile-time constants.
- *
- * @param log pointer to NULL or an optional logger object.
- * @return The configuration structure.
- */
- static LabelSessionConfig createFromCastorConf(
- cta::log::Logger *const log = NULL);
-
}; // LabelSessionConfig
} // namespace daemon
--
GitLab