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
760cf331
Commit
760cf331
authored
Aug 29, 2016
by
Victor Kotlyar
Browse files
Repalce castor::exception::CommandLineNotParsed with
cta::exception::CommandLineNotParsed
parent
020d8fea
Changes
7
Hide whitespace changes
Inline
Side-by-side
common/CMakeLists.txt
View file @
760cf331
...
...
@@ -73,6 +73,7 @@ set (COMMON_LIB_SRC_FILES
exception/UserError.cpp
exception/AcceptConnectionInterrupted.cpp
exception/BadAlloc.cpp
exception/CommandLineNotParsed.cpp
log/DummyLogger.cpp
log/LogContext.cpp
log/Logger.cpp
...
...
tapeserver/castor
/exception/CommandLineNotParsed.cpp
→
common
/exception/CommandLineNotParsed.cpp
View file @
760cf331
...
...
@@ -21,12 +21,12 @@
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#include
"c
astor
/exception/CommandLineNotParsed.hpp"
#include
"c
ommon
/exception/CommandLineNotParsed.hpp"
// -----------------------------------------------------------------------------
// Constructor
// -----------------------------------------------------------------------------
ca
stor
::
exception
::
CommandLineNotParsed
::
CommandLineNotParsed
()
:
c
t
a
::
exception
::
CommandLineNotParsed
::
CommandLineNotParsed
()
:
cta
::
exception
::
Exception
()
{
}
tapeserver/castor
/exception/CommandLineNotParsed.hpp
→
common
/exception/CommandLineNotParsed.hpp
View file @
760cf331
...
...
@@ -25,7 +25,7 @@
#include
"common/exception/Exception.hpp"
namespace
ca
stor
{
namespace
exception
{
namespace
c
t
a
{
namespace
exception
{
/**
* CommandLineNotParsed.
...
...
@@ -41,5 +41,5 @@ namespace castor { namespace exception {
};
// class CommandLineNotParsed
}
}
// namespace ca
stor
exception
}
}
// namespace c
t
a exception
tapeserver/castor/server/Daemon.cpp
View file @
760cf331
...
...
@@ -128,7 +128,7 @@ const std::string &castor::server::Daemon::getServerName() const throw() {
bool
castor
::
server
::
Daemon
::
getForeground
()
const
{
if
(
!
m_commandLineHasBeenParsed
)
{
ca
stor
::
exception
::
CommandLineNotParsed
ex
;
c
t
a
::
exception
::
CommandLineNotParsed
ex
;
ex
.
getMessage
()
<<
"Failed to determine whether or not the daemon should run in the"
" foreground because the command-line has not yet been parsed"
;
...
...
tapeserver/castor/server/Daemon.hpp
View file @
760cf331
...
...
@@ -21,7 +21,7 @@
#pragma once
#include
"c
astor
/exception/CommandLineNotParsed.hpp"
#include
"c
ommon
/exception/CommandLineNotParsed.hpp"
#include
"castor/log/Logger.hpp"
#include
"common/exception/Exception.hpp"
...
...
tapeserver/castor/server/DaemonTest.cpp
View file @
760cf331
...
...
@@ -64,7 +64,7 @@ TEST_F(castor_server_DaemonTest, getForegroundBeforeParseCommandLine) {
castor
::
log
::
DummyLogger
log
(
m_programName
);
castor
::
server
::
Daemon
daemon
(
dummyStdOut
,
dummyStdErr
,
log
);
ASSERT_THROW
(
daemon
.
getForeground
(),
ca
stor
::
exception
::
CommandLineNotParsed
);
ASSERT_THROW
(
daemon
.
getForeground
(),
c
t
a
::
exception
::
CommandLineNotParsed
);
}
TEST_F
(
castor_server_DaemonTest
,
parseEmptyCmdLine
)
{
...
...
tapeserver/castor/utils/CMakeLists.txt
View file @
760cf331
...
...
@@ -38,7 +38,6 @@ set (UTILS_LIB_SRC_FILES
../exception/MissingOperand.cpp
../exception/NoPortInRange.cpp
../exception/TimeOut.cpp
../exception/CommandLineNotParsed.cpp
../exception/OutOfMemory.cpp
../BaseObject.cpp
../Services.cpp
...
...
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