Quellcode durchsuchen

Merge pull request #12865 from nextcloud/fix/do_not_propogate_in_appdata

No need to propogate changes in appdata
tags/v16.0.0alpha1
Morris Jobke vor 5 Jahren
Ursprung
Commit
60681decdd
Es ist kein Account mit der E-Mail-Adresse des Committers verbunden
2 geänderte Dateien mit 14 neuen und 4 gelöschten Zeilen
  1. 12
    3
      lib/private/Files/Cache/Propagator.php
  2. 2
    1
      lib/private/Files/Storage/Common.php

+ 12
- 3
lib/private/Files/Cache/Propagator.php Datei anzeigen

@@ -46,12 +46,14 @@ class Propagator implements IPropagator {
private $connection;

/**
* @param \OC\Files\Storage\Storage $storage
* @param IDBConnection $connection
* @var array
*/
public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $connection) {
private $ignore = [];

public function __construct(\OC\Files\Storage\Storage $storage, IDBConnection $connection, array $ignore = []) {
$this->storage = $storage;
$this->connection = $connection;
$this->ignore = $ignore;
}


@@ -62,6 +64,13 @@ class Propagator implements IPropagator {
* @suppress SqlInjectionChecker
*/
public function propagateChange($internalPath, $time, $sizeDifference = 0) {
// Do not propogate changes in ignored paths
foreach ($this->ignore as $ignore) {
if (strpos($internalPath, $ignore) === 0) {
return;
}
}

$storageId = (int)$this->storage->getStorageCache()->getNumericId();

$parents = $this->getParents($internalPath);

+ 2
- 1
lib/private/Files/Storage/Common.php Datei anzeigen

@@ -368,7 +368,8 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage {
$storage = $this;
}
if (!isset($storage->propagator)) {
$storage->propagator = new Propagator($storage, \OC::$server->getDatabaseConnection());
$config = \OC::$server->getSystemConfig();
$storage->propagator = new Propagator($storage, \OC::$server->getDatabaseConnection(), ['appdata_' . $config->getValue('instanceid')]);
}
return $storage->propagator;
}

Laden…
Abbrechen
Speichern