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
886dbd19
Commit
886dbd19
authored
Aug 30, 2016
by
Victor Kotlyar
Browse files
Renamed castor::exception::TimeOut to
cta::exception::TimeOut
parent
a74a4743
Changes
6
Hide whitespace changes
Inline
Side-by-side
common/CMakeLists.txt
View file @
886dbd19
...
...
@@ -81,6 +81,7 @@ set (COMMON_LIB_SRC_FILES
exception/NoPortInRange.cpp
exception/NotAnOwner.cpp
exception/OutOfMemory.cpp
exception/TimeOut.cpp
log/DummyLogger.cpp
log/LogContext.cpp
log/Logger.cpp
...
...
tapeserver/castor
/exception/TimeOut.cpp
→
common
/exception/TimeOut.cpp
View file @
886dbd19
...
...
@@ -22,10 +22,10 @@
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#include
"c
astor
/exception/TimeOut.hpp"
#include
"c
ommon
/exception/TimeOut.hpp"
// -----------------------------------------------------------------------
// Constructor
// -----------------------------------------------------------------------
ca
stor
::
exception
::
TimeOut
::
TimeOut
()
:
c
t
a
::
exception
::
TimeOut
::
TimeOut
()
:
cta
::
exception
::
Exception
()
{}
tapeserver/castor
/exception/TimeOut.hpp
→
common
/exception/TimeOut.hpp
View file @
886dbd19
...
...
@@ -27,7 +27,7 @@
// Include Files
#include
"common/exception/Exception.hpp"
namespace
ca
stor
{
namespace
c
t
a
{
namespace
exception
{
...
...
@@ -47,5 +47,5 @@ namespace castor {
}
// end of namespace exception
}
// end of namespace ca
stor
}
// end of namespace c
t
a
tapeserver/castor/io/io.cpp
View file @
886dbd19
...
...
@@ -291,7 +291,7 @@ int castor::io::acceptConnection(const int listenSocketFd)
//------------------------------------------------------------------------------
int
castor
::
io
::
acceptConnection
(
const
int
listenSocketFd
,
const
time_t
timeout
)
throw
(
ca
stor
::
exception
::
TimeOut
,
c
t
a
::
exception
::
TimeOut
,
cta
::
exception
::
AcceptConnectionInterrupted
,
cta
::
exception
::
Exception
)
{
...
...
@@ -317,7 +317,7 @@ int castor::io::acceptConnection(const int listenSocketFd,
switch
(
pollRc
)
{
case
0
:
// poll() timed out
{
ca
stor
::
exception
::
TimeOut
ex
;
c
t
a
::
exception
::
TimeOut
ex
;
ex
.
getMessage
()
<<
"Failed to accept connection: poll() timed out after "
<<
timeout
<<
" seconds whilst trying to accept a connection"
;
...
...
@@ -843,7 +843,7 @@ int castor::io::connectWithTimeout(
const
std
::
string
&
hostName
,
const
unsigned
short
port
,
const
int
timeout
)
throw
(
ca
stor
::
exception
::
TimeOut
,
cta
::
exception
::
Exception
)
{
throw
(
c
t
a
::
exception
::
TimeOut
,
cta
::
exception
::
Exception
)
{
try
{
std
::
ostringstream
portStream
;
portStream
<<
port
;
...
...
@@ -906,7 +906,7 @@ int castor::io::connectWithTimeout(
const
struct
sockaddr
*
address
,
const
socklen_t
address_len
,
const
int
timeout
)
throw
(
ca
stor
::
exception
::
TimeOut
,
cta
::
exception
::
Exception
)
{
throw
(
c
t
a
::
exception
::
TimeOut
,
cta
::
exception
::
Exception
)
{
// Create the socket for the new connection
utils
::
SmartFd
smartSock
(
socket
(
sockDomain
,
sockType
,
sockProtocol
));
...
...
@@ -980,7 +980,7 @@ int castor::io::connectWithTimeout(
// Throw a timed-out exception if poll() timed-out
if
(
0
==
pollRc
)
{
ca
stor
::
exception
::
TimeOut
ex
;
c
t
a
::
exception
::
TimeOut
ex
;
ex
.
getMessage
()
<<
"Failed to connect"
": poll() timed out after "
<<
timeout
<<
" seconds"
;
...
...
tapeserver/castor/io/io.hpp
View file @
886dbd19
...
...
@@ -27,7 +27,7 @@
#include
"common/exception/AcceptConnectionInterrupted.hpp"
#include
"common/exception/InvalidArgument.hpp"
#include
"common/exception/NoPortInRange.hpp"
#include
"c
astor
/exception/TimeOut.hpp"
#include
"c
ommon
/exception/TimeOut.hpp"
#include
"castor/io/Constants.hpp"
#include
"castor/io/IpAndPort.hpp"
#include
"common/exception/Exception.hpp"
...
...
@@ -207,7 +207,7 @@ int acceptConnection(const int listenSockFd)
int
acceptConnection
(
const
int
listenSockFd
,
const
time_t
timeout
)
throw
(
ca
stor
::
exception
::
TimeOut
,
throw
(
c
t
a
::
exception
::
TimeOut
,
cta
::
exception
::
AcceptConnectionInterrupted
,
cta
::
exception
::
Exception
);
...
...
@@ -363,7 +363,7 @@ int connectWithTimeout(
const
std
::
string
&
hostName
,
const
unsigned
short
port
,
const
int
timeout
)
throw
(
ca
stor
::
exception
::
TimeOut
,
cta
::
exception
::
Exception
);
throw
(
c
t
a
::
exception
::
TimeOut
,
cta
::
exception
::
Exception
);
/**
* Creates the specified socket and uses it to connect to the specified
...
...
@@ -395,7 +395,7 @@ int connectWithTimeout(
const
struct
sockaddr
*
address
,
const
socklen_t
address_len
,
const
int
timeout
)
throw
(
ca
stor
::
exception
::
TimeOut
,
cta
::
exception
::
Exception
);
throw
(
c
t
a
::
exception
::
TimeOut
,
cta
::
exception
::
Exception
);
/**
* Marshals the specified src value into the specified destination buffer.
...
...
tapeserver/castor/utils/CMakeLists.txt
View file @
886dbd19
...
...
@@ -31,7 +31,6 @@ set (UTILS_LIB_SRC_FILES
utils.cpp
../common/CastorConfiguration.cpp
../exception/Errnum.cpp
../exception/TimeOut.cpp
../BaseObject.cpp
../Services.cpp
../Factories.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