diff options
Diffstat (limited to 'platform/servers_list.cpp')
| -rw-r--r-- | platform/servers_list.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/platform/servers_list.cpp b/platform/servers_list.cpp index ed72ea3937..f705a6f3f2 100644 --- a/platform/servers_list.cpp +++ b/platform/servers_list.cpp @@ -8,13 +8,10 @@ #include "3party/jansson/myjansson.hpp" - -#define SETTINGS_SERVERS_KEY "LastBaseUrls" - - namespace downloader { +// Returns false if can't parse urls. Note that it also clears outUrls. bool ParseServerList(string const & jsonStr, vector<string> & outUrls) { outUrls.clear(); @@ -37,20 +34,15 @@ bool ParseServerList(string const & jsonStr, vector<string> & outUrls) void GetServerListFromRequest(HttpRequest const & request, vector<string> & urls) { - if (request.Status() == HttpRequest::ECompleted && - ParseServerList(request.Data(), urls)) + if (request.Status() == HttpRequest::ECompleted && ParseServerList(request.Data(), urls)) { - Settings::Set(SETTINGS_SERVERS_KEY, request.Data()); + return; } else { - LOG(LWARNING, ("Can't get servers list from request")); - - string serverList; - if (!Settings::Get(SETTINGS_SERVERS_KEY, serverList)) - serverList = GetPlatform().DefaultUrlsJSON(); - VERIFY ( ParseServerList(serverList, urls), () ); + VERIFY(ParseServerList(GetPlatform().DefaultUrlsJSON(), urls), ()); + LOG(LWARNING, ("Can't get servers list from request, using default servers:", urls)); } } -} +} // namespace downloader |