Merge pull request #24799 from nextcloud/backport/24796/stable19

juliusknorr · web-flow · commit 8b15f820a1d3 · 2020-12-21T16:01:09.000+01:00
[stable19] Actually set the TTL on redis set
diff --git a/lib/private/Memcache/Redis.php b/lib/private/Memcache/Redis.php
@@ -101,7 +101,13 @@ public function add($key, $value, $ttl = 0) {
 		if (!is_int($value)) {
 			$value = json_encode($value);
 		}
-		return self::$cache->setnx($this->getPrefix() . $key, $value);
+
+		$args = ['nx'];
+		if ($ttl !== 0 && is_int($ttl)) {
+			$args['ex'] = $ttl;
+		}
+
+		return self::$cache->set($this->getPrefix() . $key, $value, $args);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,13 @@ public function add($key, $value, $ttl = 0) {`
`101`	`101`	`if (!is_int($value)) {`
`102`	`102`	`$value = json_encode($value);`
`103`	`103`	`}`
`104`		`- return self::$cache->setnx($this->getPrefix() . $key, $value);`
	`104`	`+`
	`105`	`+ $args = ['nx'];`
	`106`	`+ if ($ttl !== 0 && is_int($ttl)) {`
	`107`	`+ $args['ex'] = $ttl;`
	`108`	`+ }`
	`109`	`+`
	`110`	`+ return self::$cache->set($this->getPrefix() . $key, $value, $args);`
`105`	`111`	`}`
`106`	`112`
`107`	`113`	`/**`