Mercurial > hg > svcore
diff data/fileio/CachedFile.cpp @ 1527:710e6250a401 zoom
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Mon, 17 Sep 2018 13:51:14 +0100 |
| parents | f2fcb3ed51fa |
| children |
line wrap: on
line diff
--- a/data/fileio/CachedFile.cpp Mon Dec 12 15:18:52 2016 +0000 +++ b/data/fileio/CachedFile.cpp Mon Sep 17 13:51:14 2018 +0100 @@ -157,7 +157,7 @@ SVDEBUG << "CachedFile::check: Retrieval succeeded" << endl; updateLastRetrieval(true); } else { - cerr << "CachedFile::check: Retrieval failed, will try again later (using existing file for now)" << endl; + SVCERR << "CachedFile::check: Retrieval failed, will try again later (using existing file for now)" << endl; } } } else { @@ -168,7 +168,7 @@ m_ok = true; updateLastRetrieval(true); } else { - cerr << "CachedFile::check: Retrieval failed, remaining in invalid state" << endl; + SVCERR << "CachedFile::check: Retrieval failed, remaining in invalid state" << endl; // again, we don't need to do anything here -- the last // retrieval timestamp is already invalid } @@ -212,7 +212,7 @@ QFile previous(m_localFilename); if (previous.exists()) { if (!previous.remove()) { - cerr << "CachedFile::retrieve: ERROR: Failed to remove previous copy of cached file at \"" << m_localFilename << "\"" << endl; + SVCERR << "CachedFile::retrieve: ERROR: Failed to remove previous copy of cached file at \"" << m_localFilename << "\"" << endl; return false; } } @@ -222,7 +222,7 @@ //!!! disk space left) if (!tempFile.copy(m_localFilename)) { - cerr << "CachedFile::retrieve: ERROR: Failed to copy newly retrieved file from \"" << tempName << "\" to \"" << m_localFilename << "\"" << endl; + SVCERR << "CachedFile::retrieve: ERROR: Failed to copy newly retrieved file from \"" << tempName << "\" to \"" << m_localFilename << "\"" << endl; return false; }