Merge pull request #38819 from owncloud/smb_faster_innactive_log

Jan Ackermann · web-flow · commit a0f94c8b7c67 · 2021-06-10T14:37:40.000+02:00
Check a local attribute for the SMB log switch instead
diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php
@@ -54,6 +54,9 @@
 use OCP\Util;
 
 class SMB extends StorageAdapter {
+	/** @var bool */
+	protected $logActive;
+
 	/**
 	 * @var IServer
 	 */
@@ -75,6 +78,11 @@ class SMB extends StorageAdapter {
 	protected $statCache;
 
 	public function __construct($params) {
+		// log switch might be set already (from a subclass), so don't change it.
+		if (!isset($this->logActive)) {
+			$this->logActive = \OC::$server->getConfig()->getSystemValue('smb.logging.enable', false) === true;
+		}
+
 		$loggedParams = $params;
 		// remove password from log if it is set
 		if (!empty($loggedParams['password'])) {
@@ -743,7 +751,7 @@ public function test() {
 	 * @param string $from
 	 */
 	private function log($message, $level = Util::DEBUG, $from = 'smb') {
-		if (\OC::$server->getConfig()->getSystemValue('smb.logging.enable', false) === true) {
+		if ($this->logActive) {
 			Util::writeLog($from, $message, $level);
 		}
 	}
@@ -757,7 +765,7 @@ private function log($message, $level = Util::DEBUG, $from = 'smb') {
 	 * @return mixed
 	 */
 	private function leave($function, $result) {
-		if (\OC::$server->getConfig()->getSystemValue('smb.logging.enable', false) === false) {
+		if (!$this->logActive) {
 			//don't bother building log strings
 			return $result;
 		} elseif ($result === true) {
@@ -780,7 +788,7 @@ private function leave($function, $result) {
 	}
 
 	private function swallow($function, \Exception $exception) {
-		if (\OC::$server->getConfig()->getSystemValue('smb.logging.enable', false) === true) {
+		if ($this->logActive) {
 			Util::writeLog('smb', "$function swallowing ".\get_class($exception)
 				.' - code: '.$exception->getCode()
 				.' message: '.$exception->getMessage()
diff --git a/changelog/unreleased/38819 b/changelog/unreleased/38819
@@ -0,0 +1,10 @@
+Enhancement: Improve performance of the SMB log when it is inactive
+
+The SMB connector includes very verbose logs to trace what could have
+gone wrong. These logs are disabled by default, but although they're disabled
+we still need to check the state to decide whether we want to log or not.
+
+Now, the state check is faster and it takes less time to decide, so the
+overall performance of the connector is improved.
+
+https://github.com/owncloud/core/pull/38819
