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
6cd5c8b8
Commit
6cd5c8b8
authored
Aug 29, 2016
by
Victor Kotlyar
Browse files
Moved castor::exception::AcceptConnectionInterrupted to the
cta::exception::AcceptConnectionInterrupted
parent
fc4fb91b
Changes
6
Hide whitespace changes
Inline
Side-by-side
common/CMakeLists.txt
View file @
6cd5c8b8
...
...
@@ -71,6 +71,7 @@ set (COMMON_LIB_SRC_FILES
exception/NonRetryableError.cpp
exception/RetryableError.cpp
exception/UserError.cpp
exception/AcceptConnectionInterrupted.cpp
log/DummyLogger.cpp
log/LogContext.cpp
log/Logger.cpp
...
...
tapeserver/castor
/exception/AcceptConnectionInterrupted.cpp
→
common
/exception/AcceptConnectionInterrupted.cpp
View file @
6cd5c8b8
...
...
@@ -21,13 +21,13 @@
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#include
"c
astor
/exception/AcceptConnectionInterrupted.hpp"
#include
"c
ommon
/exception/AcceptConnectionInterrupted.hpp"
// -----------------------------------------------------------------------------
// constructor
// -----------------------------------------------------------------------------
ca
stor
::
exception
::
AcceptConnectionInterrupted
::
AcceptConnectionInterrupted
(
c
t
a
::
exception
::
AcceptConnectionInterrupted
::
AcceptConnectionInterrupted
(
const
time_t
remainingTime
)
throw
()
:
cta
::
exception
::
Exception
(),
m_remainingTime
(
remainingTime
)
{
...
...
@@ -38,7 +38,7 @@ castor::exception::AcceptConnectionInterrupted::AcceptConnectionInterrupted(
// -----------------------------------------------------------------------------
// remainingTime()
// -----------------------------------------------------------------------------
time_t
ca
stor
::
exception
::
AcceptConnectionInterrupted
::
remainingTime
()
const
time_t
c
t
a
::
exception
::
AcceptConnectionInterrupted
::
remainingTime
()
const
throw
()
{
return
m_remainingTime
;
}
tapeserver/castor
/exception/AcceptConnectionInterrupted.hpp
→
common
/exception/AcceptConnectionInterrupted.hpp
View file @
6cd5c8b8
...
...
@@ -27,7 +27,7 @@
#include
<sys/types.h>
namespace
ca
stor
{
namespace
c
t
a
{
namespace
exception
{
/**
...
...
tapeserver/castor/io/io.cpp
View file @
6cd5c8b8
...
...
@@ -292,7 +292,7 @@ int castor::io::acceptConnection(const int listenSocketFd)
int
castor
::
io
::
acceptConnection
(
const
int
listenSocketFd
,
const
time_t
timeout
)
throw
(
castor
::
exception
::
TimeOut
,
ca
stor
::
exception
::
AcceptConnectionInterrupted
,
c
t
a
::
exception
::
AcceptConnectionInterrupted
,
cta
::
exception
::
Exception
)
{
// Throw an exception if listenSocketFd is invalid
...
...
@@ -329,7 +329,7 @@ int castor::io::acceptConnection(const int listenSocketFd,
if
(
pollErrno
==
EINTR
)
{
const
time_t
remainingTime
=
timeout
-
(
time
(
NULL
)
-
startTime
);
ca
stor
::
exception
::
AcceptConnectionInterrupted
ex
(
remainingTime
);
c
t
a
::
exception
::
AcceptConnectionInterrupted
ex
(
remainingTime
);
throw
ex
;
}
else
{
...
...
tapeserver/castor/io/io.hpp
View file @
6cd5c8b8
...
...
@@ -24,7 +24,7 @@
#pragma once
#include
"c
astor
/exception/AcceptConnectionInterrupted.hpp"
#include
"c
ommon
/exception/AcceptConnectionInterrupted.hpp"
#include
"castor/exception/InvalidArgument.hpp"
#include
"castor/exception/NoPortInRange.hpp"
#include
"castor/exception/TimeOut.hpp"
...
...
@@ -208,7 +208,7 @@ int acceptConnection(
const
int
listenSockFd
,
const
time_t
timeout
)
throw
(
castor
::
exception
::
TimeOut
,
ca
stor
::
exception
::
AcceptConnectionInterrupted
,
c
t
a
::
exception
::
AcceptConnectionInterrupted
,
cta
::
exception
::
Exception
);
/**
...
...
tapeserver/castor/utils/CMakeLists.txt
View file @
6cd5c8b8
...
...
@@ -40,7 +40,6 @@ set (UTILS_LIB_SRC_FILES
../exception/MissingOperand.cpp
../exception/NoPortInRange.cpp
../exception/TimeOut.cpp
../exception/AcceptConnectionInterrupted.cpp
../exception/CommandLineNotParsed.cpp
../exception/OutOfMemory.cpp
../BaseObject.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