From 044d01d0e13330120753077ba2ab3869da11e082 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 12 Mar 2018 18:10:59 +0100
Subject: [PATCH] Use proper method to log exceptions

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 apps/files/ajax/list.php                      |  6 ++---
 .../lib/Lib/Storage/AmazonS3.php              | 24 +++++++++----------
 apps/files_external/lib/config.php            |  2 +-
 lib/base.php                                  |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index 617ad18ac1..de3c7ccce5 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -81,7 +81,7 @@ try {
 
 	OCP\JSON::success(array('data' => $data));
 } catch (\OCP\Files\StorageNotAvailableException $e) {
-	\OCP\Util::logException('files', $e);
+	\OC::$server->getLogger()->logException($e, ['app' => 'files']);
 	OCP\JSON::error([
 		'data' => [
 			'exception' => StorageNotAvailableException::class,
@@ -89,7 +89,7 @@ try {
 		]
 	]);
 } catch (\OCP\Files\StorageInvalidException $e) {
-	\OCP\Util::logException('files', $e);
+	\OC::$server->getLogger()->logException($e, ['app' => 'files']);
 	OCP\JSON::error(array(
 		'data' => array(
 			'exception' => StorageInvalidException::class,
@@ -97,7 +97,7 @@ try {
 		)
 	));
 } catch (\Exception $e) {
-	\OCP\Util::logException('files', $e);
+	\OC::$server->getLogger()->logException($e, ['app' => 'files']);
 	OCP\JSON::error(array(
 		'data' => array(
 			'exception' => \Exception::class,
diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php
index 459f9b80e1..553e531633 100644
--- a/apps/files_external/lib/Lib/Storage/AmazonS3.php
+++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php
@@ -194,7 +194,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			));
 			$this->testTimeout();
 		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
+			\OC::$server->getLogger()->logException($e, ['app' => 'files_external']);
 			return false;
 		}
 
@@ -261,7 +261,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 				// we reached the end when the list is no longer truncated
 			} while ($objects['IsTruncated']);
 		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
+			\OC::$server->getLogger()->logException($e, ['app' => 'files_external']);
 			return false;
 		}
 		return true;
@@ -305,7 +305,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 
 			return IteratorDirectory::wrap($files);
 		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
+			\OC::$server->getLogger()->logException($e, ['app' => 'files_external']);
 			return false;
 		}
 	}
@@ -333,7 +333,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 
 			return $stat;
 		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
+			\OC::$server->getLogger()->logException($e, ['app' => 'files_external']);
 			return false;
 		}
 	}
@@ -343,7 +343,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 		try {
 			return $this->isRoot($path) || $this->headObject($path . '/');
 		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
+			\OC::$server->getLogger()->logException($e, ['app' => 'files_external']);
 			return false;
 		}
 	}
@@ -363,7 +363,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 				return 'dir';
 			}
 		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
+			\OC::$server->getLogger()->logException($e, ['app' => 'files_external']);
 			return false;
 		}
 
@@ -389,7 +389,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			$this->deleteObject($path);
 			$this->invalidateCache($path);
 		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
+			\OC::$server->getLogger()->logException($e, ['app' => 'files_external']);
 			return false;
 		}
 
@@ -405,7 +405,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 				try {
 					return $this->readObject($path);
 				} catch (S3Exception $e) {
-					\OCP\Util::logException('files_external', $e);
+					\OC::$server->getLogger()->logException($e, ['app' => 'files_external']);
 					return false;
 				}
 			case 'w':
@@ -483,7 +483,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 				$this->testTimeout();
 			}
 		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
+			\OC::$server->getLogger()->logException($e, ['app' => 'files_external']);
 			return false;
 		}
 
@@ -504,7 +504,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 				));
 				$this->testTimeout();
 			} catch (S3Exception $e) {
-				\OCP\Util::logException('files_external', $e);
+				\OC::$server->getLogger()->logException($e, ['app' => 'files_external']);
 				return false;
 			}
 		} else {
@@ -518,7 +518,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 				));
 				$this->testTimeout();
 			} catch (S3Exception $e) {
-				\OCP\Util::logException('files_external', $e);
+				\OC::$server->getLogger()->logException($e, ['app' => 'files_external']);
 				return false;
 			}
 
@@ -591,7 +591,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			unlink($tmpFile);
 			return true;
 		} catch (S3Exception $e) {
-			\OCP\Util::logException('files_external', $e);
+			\OC::$server->getLogger()->logException($e, ['app' => 'files_external']);
 			return false;
 		}
 	}
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 5238eaa42b..a1e7d12bca 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -247,7 +247,7 @@ class OC_Mount_Config {
 					throw $e;
 				}
 			} catch (Exception $exception) {
-				\OCP\Util::logException('files_external', $exception);
+				\OC::$server->getLogger()->logException($exception, ['app' => 'files_external']);
 				throw $exception;
 			}
 		}
diff --git a/lib/base.php b/lib/base.php
index f0e139d92c..0c78d235c5 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -426,7 +426,7 @@ class OC {
 
 			// if session can't be started break with http 500 error
 		} catch (Exception $e) {
-			\OCP\Util::logException('base', $e);
+			\OC::$server->getLogger()->logException($e, ['app' => 'base']);
 			//show the user a detailed error page
 			OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
 			OC_Template::printExceptionErrorPage($e);