Get first backup status quicker

This commit is contained in:
Martin 2016-06-05 23:57:18 +02:00
parent d56e59b185
commit a8f8f5b637
4 changed files with 17 additions and 6 deletions

View File

@ -539,7 +539,7 @@ bool Connector::restoreOk( bool ok, wxLongLong_t& process_id)
return root["ok"].asBool();
}
SStatus Connector::initStatus(wxSocketClient* last_client, size_t timeoutms/*=5000*/ )
SStatus Connector::initStatus(wxSocketClient* last_client, bool fast, size_t timeoutms/*=5000*/ )
{
if (last_client != NULL
&& last_client->Error())
@ -550,7 +550,15 @@ SStatus Connector::initStatus(wxSocketClient* last_client, size_t timeoutms/*=50
bool change_command=false;
bool set_busy=false;
std::string cmd="STATUS";
std::string cmd;
if(fast)
{
cmd = "FSTATUS";
}
else
{
cmd = "STATUS";
}
std::string args="";
std::string curr_pw = getPasswordData(change_command, set_busy);

View File

@ -161,7 +161,7 @@ public:
static SStatusDetails getStatusDetails(SConnection* connection = NULL);
static int getCapabilities();
static bool restoreOk(bool ok, wxLongLong_t& process_id);
static SStatus initStatus(wxSocketClient* last_client, size_t timeoutms=5000);
static SStatus initStatus(wxSocketClient* last_client, bool fast, size_t timeoutms=5000);
static bool hasError(void);
static bool isBusy(void);

View File

@ -26,6 +26,7 @@
#include "TranslationHelper.h"
#include "Status.h"
#include <iostream>
#include <limits>
#include <wx/stdpaths.h>
#include <wx/dir.h>
#include <wx/filename.h>
@ -509,9 +510,9 @@ int MyApp::OnExit()
}
MyTimer::MyTimer(void) :
wxTimer()
wxTimer(), first_status(true)
{
capa=0;
capa=INT_MAX;
resetDisplayedUpdateInfo();
}
@ -590,7 +591,8 @@ void MyTimer::Notify()
static SStatus status;
if(!status.init || status.hasError())
{
status = Connector::initStatus(status.client, 60000);
status = Connector::initStatus(status.client, first_status, 60000);
first_status = false;
}
if(Connector::hasError() )

1
main.h
View File

@ -56,4 +56,5 @@ public:
private:
int capa;
bool displayed_update_info;
bool first_status;
};