Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dCache
cta
Commits
9419e489
Commit
9419e489
authored
Aug 30, 2016
by
Victor Kotlyar
Browse files
Renamed castor::exception::InvalidConfigEntry to
cta::exception::InvalidConfigEntry
parent
fe4fb905
Changes
7
Hide whitespace changes
Inline
Side-by-side
common/CMakeLists.txt
View file @
9419e489
...
...
@@ -75,6 +75,7 @@ set (COMMON_LIB_SRC_FILES
exception/BadAlloc.cpp
exception/CommandLineNotParsed.cpp
exception/InvalidArgument.cpp
exception/InvalidConfigEntry.cpp
log/DummyLogger.cpp
log/LogContext.cpp
log/Logger.cpp
...
...
tapeserver/castor
/exception/InvalidConfigEntry.cpp
→
common
/exception/InvalidConfigEntry.cpp
View file @
9419e489
...
...
@@ -21,7 +21,7 @@
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#include
"c
astor
/exception/InvalidConfigEntry.hpp"
#include
"c
ommon
/exception/InvalidConfigEntry.hpp"
#include
<errno.h>
...
...
@@ -29,7 +29,7 @@
// -----------------------------------------------------------------------------
// Constructor
// -----------------------------------------------------------------------------
ca
stor
::
exception
::
InvalidConfigEntry
::
InvalidConfigEntry
(
c
t
a
::
exception
::
InvalidConfigEntry
::
InvalidConfigEntry
(
const
char
*
const
entryCategory
,
const
char
*
const
entryName
,
const
char
*
const
entryValue
)
:
cta
::
exception
::
Exception
(),
m_entryCategory
(
entryCategory
),
...
...
@@ -40,7 +40,7 @@ castor::exception::InvalidConfigEntry::InvalidConfigEntry(
// -----------------------------------------------------------------------------
// getEntryCategory()
// -----------------------------------------------------------------------------
const
std
::
string
&
ca
stor
::
exception
::
InvalidConfigEntry
::
getEntryCategory
()
{
const
std
::
string
&
c
t
a
::
exception
::
InvalidConfigEntry
::
getEntryCategory
()
{
return
m_entryCategory
;
}
...
...
@@ -48,7 +48,7 @@ const std::string &castor::exception::InvalidConfigEntry::getEntryCategory() {
// -----------------------------------------------------------------------------
// getEntryName()
// -----------------------------------------------------------------------------
const
std
::
string
&
ca
stor
::
exception
::
InvalidConfigEntry
::
getEntryName
()
{
const
std
::
string
&
c
t
a
::
exception
::
InvalidConfigEntry
::
getEntryName
()
{
return
m_entryName
;
}
...
...
@@ -56,7 +56,7 @@ const std::string &castor::exception::InvalidConfigEntry::getEntryName() {
// -----------------------------------------------------------------------------
// getEntryValue()
// -----------------------------------------------------------------------------
const
std
::
string
&
ca
stor
::
exception
::
InvalidConfigEntry
::
getEntryValue
()
const
std
::
string
&
c
t
a
::
exception
::
InvalidConfigEntry
::
getEntryValue
()
{
return
m_entryValue
;
}
tapeserver/castor
/exception/InvalidConfigEntry.hpp
→
common
/exception/InvalidConfigEntry.hpp
View file @
9419e489
...
...
@@ -28,7 +28,7 @@
#include
<string>
namespace
ca
stor
{
namespace
exception
{
namespace
c
t
a
{
namespace
exception
{
/**
* Invalid configuration entry exception.
...
...
@@ -88,5 +88,5 @@ namespace castor { namespace exception {
};
// class InvalidConfigEntry
}
}
// namespace ca
stor
exception
}
}
// namespace c
t
a exception
tapeserver/castor/common/CastorConfiguration.hpp
View file @
9419e489
...
...
@@ -154,7 +154,7 @@ namespace castor {
}
if
(
!
castor
::
utils
::
isValidUInt
(
strValue
.
c_str
()))
{
ca
stor
::
exception
::
InvalidConfigEntry
ex
(
category
.
c_str
(),
c
t
a
::
exception
::
InvalidConfigEntry
ex
(
category
.
c_str
(),
key
.
c_str
(),
strValue
.
c_str
());
ex
.
getMessage
()
<<
"Failed to get configuration entry "
<<
category
<<
":"
<<
key
<<
": Value is not a valid unsigned integer: value="
<<
...
...
@@ -196,7 +196,7 @@ namespace castor {
const
std
::
string
strValue
=
getConfEntString
(
category
,
key
);
if
(
!
castor
::
utils
::
isValidUInt
(
strValue
.
c_str
()))
{
ca
stor
::
exception
::
InvalidConfigEntry
ex
(
category
.
c_str
(),
c
t
a
::
exception
::
InvalidConfigEntry
ex
(
category
.
c_str
(),
key
.
c_str
(),
strValue
.
c_str
());
ex
.
getMessage
()
<<
"Failed to get configuration entry "
<<
category
<<
":"
<<
key
<<
": Value is not a valid unsigned integer: value="
<<
...
...
tapeserver/castor/tape/tapeserver/daemon/TapeDaemon.hpp
View file @
9419e489
...
...
@@ -24,7 +24,7 @@
#pragma once
#include
"castor/common/CastorConfiguration.hpp"
#include
"c
astor
/exception/InvalidConfigEntry.hpp"
#include
"c
ommon
/exception/InvalidConfigEntry.hpp"
#include
"castor/exception/NoEntry.hpp"
#include
"castor/server/Daemon.hpp"
#include
"castor/server/ProcessCap.hpp"
...
...
tapeserver/castor/utils/CMakeLists.txt
View file @
9419e489
...
...
@@ -33,7 +33,6 @@ set (UTILS_LIB_SRC_FILES
../exception/NoEntry.cpp
../exception/Errnum.cpp
../exception/NotAnOwner.cpp
../exception/InvalidConfigEntry.cpp
../exception/MissingOperand.cpp
../exception/NoPortInRange.cpp
../exception/TimeOut.cpp
...
...
tapeserver/castor/utils/utils.hpp
View file @
9419e489
...
...
@@ -25,7 +25,7 @@
#pragma once
#include
"common/exception/InvalidArgument.hpp"
#include
"c
astor
/exception/InvalidConfigEntry.hpp"
#include
"c
ommon
/exception/InvalidConfigEntry.hpp"
#include
"castor/exception/InvalidConfiguration.hpp"
#include
"common/exception/Exception.hpp"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment