mirrors/urbackup_backend
2
0
Fork 0
mirror of https://github.com/uroni/urbackup_backend.git synced 2025-10-26 11:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not shutdown socket during image download

Browse Source
This commit is contained in:
Martin 2017-08-11 13:14:35 +02:00
parent ae25681ad7
commit fd1b44bf52
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
urbackupserver/server_channel.cpp
View File

@ -155,7 +155,7 @@ ServerChannelThread::ServerChannelThread(ClientMain *client_main, const std::str
bool internet_mode, bool allow_restore, const std::string& identity, std::string server_token, const std::string& virtual_client) :
client_main(client_main), clientname(clientname), clientid(clientid), settings(NULL),
internet_mode(internet_mode), allow_restore(allow_restore), keepalive_thread(NULL), server_token(server_token),
virtual_client(virtual_client)
virtual_client(virtual_client), allow_shutdown(true)
{
do_exit=false;
mutex=Server->createMutex();
@ -178,7 +178,7 @@ void ServerChannelThread::operator()(void)
std::string curr_ident;
while(do_exit==false)
while(!do_exit)
{
if(input==NULL)
{
@ -284,7 +284,8 @@ void ServerChannelThread::doExit(void)
{
IScopedLock lock(mutex);
do_exit=true;
if(input!=NULL)
if(input!=NULL
&& allow_shutdown)
{
input->shutdown();
}
@ -392,8 +393,18 @@ std::string ServerChannelThread::processMsg(const std::string &msg)
str_map params;
ParseParamStrHttp(s_params, &params);
{
IScopedLock lock(mutex);
allow_shutdown = false;
}
DOWNLOAD_IMAGE(params);
Server->getDatabase(Server->getThreadID(), URBACKUPDB_SERVER)->destroyAllQueries();
{
IScopedLock lock(mutex);
allow_shutdown = true;
}
}
else if(next(msg, 0, "DOWNLOAD FILES TOKENS "))
{

1
urbackupserver/server_channel.h
View File

@ -67,6 +67,7 @@ private:
volatile bool do_exit;
bool internet_mode;
bool allow_restore;
bool allow_shutdown;
std::string salt;
std::string session;