FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable persistent TerraSync cache for HTTP

Browse Source 
- since the root-level request for an HTTP repo is small, and static,
  it doesn’t make sense to use the same persistent cache, especially
  for initial testing.
This commit is contained in:
James Turner 2016-03-05 09:53:37 +00:00
parent 49146f41e3
commit 2438dd8a08
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
simgear/scene/tsync/terrasync.cxx
View File

@ -927,13 +927,21 @@ void SGTerraSync::reinit()
if (_terraRoot->getBoolValue("enabled",false))
{
_svnThread->setSvnServer(_terraRoot->getStringValue("svn-server",""));
_svnThread->setHTTPServer(_terraRoot->getStringValue("http-server",""));
std::string httpServer(_terraRoot->getStringValue("http-server",""));
_svnThread->setHTTPServer(httpServer);
_svnThread->setSvnDataServer(_terraRoot->getStringValue("svn-data-server",""));
_svnThread->setRsyncServer(_terraRoot->getStringValue("rsync-server",""));
_svnThread->setLocalDir(_terraRoot->getStringValue("scenery-dir",""));
_svnThread->setAllowedErrorCount(_terraRoot->getIntValue("max-errors",5));
_svnThread->setUseBuiltin(_terraRoot->getBoolValue("use-built-in-svn",true));
_svnThread->setCachePath(SGPath(_terraRoot->getStringValue("cache-path","")));
if (httpServer.empty()) {
// HTTP doesn't benefit from using the persistent cache
_svnThread->setCachePath(SGPath(_terraRoot->getStringValue("cache-path","")));
} else {
SG_LOG(SG_TERRASYNC, SG_INFO, "HTTP repository selected, disabling persistent cache");
}
_svnThread->setCacheHits(_terraRoot->getIntValue("cache-hit", 0));
_svnThread->setUseSvn(_terraRoot->getBoolValue("use-svn",true));
_svnThread->setExtSvnUtility(_terraRoot->getStringValue("ext-svn-utility","svn"));