diff options
author | AmineChikhaoui <amine.chikhaoui91@gmail.com> | 2018-04-06T10·05+0100 |
---|---|---|
committer | AmineChikhaoui <amine.chikhaoui91@gmail.com> | 2018-04-06T10·05+0100 |
commit | 62d75ad3e18a6ff8973fb95e7fbc58802c477eac (patch) | |
tree | 577d2dd0e72b148c24ef2d77d7b9016408cd63cc | |
parent | 33b08899d591125ad7900e7005e2b8862f31bba0 (diff) |
rename the options to mention it's a narinfo TTL as disk cache is used all over the place for other operations
-rw-r--r-- | src/libstore/globals.hh | 4 | ||||
-rw-r--r-- | src/libstore/nar-info-disk-cache.cc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index 00147f615f49..7430bbedbe44 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -313,11 +313,11 @@ public: Setting<Strings> trustedUsers{this, {"root"}, "trusted-users", "Which users or groups are trusted to ask the daemon to do unsafe things."}; - Setting<unsigned int> ttlNegativeDiskCache{this, 3600, "negative-disk-cache-ttl", + Setting<unsigned int> ttlNegativeNarInfoCache{this, 3600, "narinfo-cache-negative-ttl", "The TTL in seconds for negative lookups in the disk cache i.e binary cache lookups that " "return an invalid path result"}; - Setting<unsigned int> ttlPositiveDiskCache{this, 30 * 24 * 3600, "positive-disk-cache-ttl", + Setting<unsigned int> ttlPositiveNarInfoCache{this, 30 * 24 * 3600, "narinfo-cache-positive-ttl", "The TTL in seconds for positive lookups in the disk cache i.e binary cache lookups that " "return a valid path result."}; diff --git a/src/libstore/nar-info-disk-cache.cc b/src/libstore/nar-info-disk-cache.cc index 1e143736f8e2..35403e5df56f 100644 --- a/src/libstore/nar-info-disk-cache.cc +++ b/src/libstore/nar-info-disk-cache.cc @@ -113,8 +113,8 @@ public: SQLiteStmt(state->db, "delete from NARs where ((present = 0 and timestamp < ?) or (present = 1 and timestamp < ?))") .use() - (now - settings.ttlNegativeDiskCache) - (now - settings.ttlPositiveDiskCache) + (now - settings.ttlNegativeNarInfoCache) + (now - settings.ttlPositiveNarInfoCache) .exec(); debug("deleted %d entries from the NAR info disk cache", sqlite3_changes(state->db)); @@ -183,8 +183,8 @@ public: auto queryNAR(state->queryNAR.use() (cache.id) (hashPart) - (now - settings.ttlNegativeDiskCache) - (now - settings.ttlPositiveDiskCache)); + (now - settings.ttlNegativeNarInfoCache) + (now - settings.ttlPositiveNarInfoCache)); if (!queryNAR.next()) return {oUnknown, 0}; |