refactor loggingfeature/fix-notes-sync

4 files changed, 14 insertions, 18 deletions

diff --git a/lib/Analyzer/EntropyAnalyzer.php b/lib/Analyzer/EntropyAnalyzer.php
index b87d3e6..9e40b62 100644
--- a/lib/Analyzer/EntropyAnalyzer.php
+++ b/lib/Analyzer/EntropyAnalyzer.php
@@ -163,18 +163,16 @@ class EntropyAnalyzer
     {
         $handle = $node->fopen('r');
         if (!$handle) {
-            $this->logger->debug('calculateEntropyOfFile: Getting data failed.', array('app' => Application::APP_ID));
+            $this->logger->warning('calculateEntropyOfFile: Getting data failed.', array('app' => Application::APP_ID));
 
             return 0.0;
         }
 
         $entropy = 0.0;
         $total = 0;
-        $this->logger->error("Calculate entropy", ['app' =>  Application::APP_ID]);
 
         while (!feof($handle)) {
             $data = fread($handle, 1024);
-            $this->logger->error("Data ".$data, ['app' =>  Application::APP_ID]);
             $total = $total + 1;
             if (strlen($data) === 1024) {
                 $entropy = $entropy + $this->entropy->calculateEntropy($data);
diff --git a/lib/Controller/ScanController.php b/lib/Controller/ScanController.php
index bd59fcc..a7eca58 100644
--- a/lib/Controller/ScanController.php
+++ b/lib/Controller/ScanController.php
@@ -165,7 +165,6 @@ class ScanController extends OCSController
 
             return new JSONResponse(['status' => 'error', 'message' => 'File does not exist.', 'path' => $trashPath, 'name' => $name, 'mtime' => $timestamp], Http::STATUS_OK);
         } else {
-            // wubalubadubdub
             // Scan can only detect WRITE and DELETE this should never happen.
             $this->logger->error('postRecover: RENAME or CREATE operation.', array('app' => Application::APP_ID));
             return new JSONResponse(['status' => 'error', 'message' => 'Wrong command.'], Http::STATUS_BAD_REQUEST);
diff --git a/lib/Events/FilesEvents.php b/lib/Events/FilesEvents.php
index abd514b..04ea567 100644
--- a/lib/Events/FilesEvents.php
+++ b/lib/Events/FilesEvents.php
@@ -57,7 +57,7 @@ class FilesEvents {
 	 * @param array $params
 	 */
 	public function onFileUpdate(array $params) {
-        $this->logger->error("Updating ".$params['path'], ['app' =>  Application::APP_ID]);
+        $this->logger->debug("Updating ".$params['path'].": Params: ".print_r($params, true), ['app' =>  Application::APP_ID]);
         $this->analyze([$params['path']], Monitor::WRITE);
 	}
 
@@ -66,7 +66,7 @@ class FilesEvents {
 	 * @param array $params
 	 */
 	public function onFileRename(array $params) {
-        $this->logger->error("Renaming ".$params['oldpath']." to ".$params['newpath'], ['app' =>  Application::APP_ID]);
+        $this->logger->debug("Renaming ".$params['oldpath']." to ".$params['newpath'].": Params: ".print_r($params, true), ['app' =>  Application::APP_ID]);
         $this->analyze([$params['oldpath'], $params['newpath']], Monitor::RENAME);
     }
 
@@ -74,7 +74,7 @@ class FilesEvents {
 	 * @param array $params
 	 */
     public function onFileCreate(array $params) {
-        $this->logger->error("Creating ".$params['path'], ['app' =>  Application::APP_ID]);
+        $this->logger->debug("Creating ".$params['path'].": Params: ".print_r($params, true), ['app' =>  Application::APP_ID]);
         $this->analyze([$params['path']], Monitor::CREATE);
     }
     
@@ -82,7 +82,7 @@ class FilesEvents {
 	 * @param array $params
 	 */
     public function onFileWrite(array $params) {
-        $this->logger->error("Writing ".$params['path']." whole array ".implode($params), ['app' =>  Application::APP_ID]);
+        $this->logger->debug("Writing ".$params['path'].": Params: ".print_r($params, true), ['app' =>  Application::APP_ID]);
         $this->analyze([$params['path']], Monitor::WRITE);
     }
     
@@ -90,7 +90,7 @@ class FilesEvents {
 	 * @param array $params
 	 */
     public function onFileDelete(array $params) {
-        $this->logger->error("Deleting ".$params['path'], ['app' =>  Application::APP_ID]);
+        $this->logger->debug("Deleting ".$params['path'].": Params: ".print_r($params, true), ['app' =>  Application::APP_ID]);
         $this->analyze([$params['path']], Monitor::DELETE);
     }
     
@@ -98,7 +98,7 @@ class FilesEvents {
 	 * @param array $params
 	 */
     public function onFileCopy(array $params) {
-        $this->logger->error("Copying ".$params['oldpath']." to ".$params['newpath'], ['app' =>  Application::APP_ID]);
+        $this->logger->debug("Copying ".$params['oldpath']." to ".$params['newpath'].": Params: ".print_r($params, true), ['app' =>  Application::APP_ID]);
         $this->analyze([$params['oldpath'], $params['newpath']], Monitor::RENAME);
     }
     
@@ -106,7 +106,7 @@ class FilesEvents {
 	 * @param array $params
 	 */
     public function onFileTouch(array $params) {
-        $this->logger->error("Touching ".$params['path'], ['app' =>  Application::APP_ID]);
+        $this->logger->debug("Touching ".$params['path'].": Params: ".print_r($params, true), ['app' =>  Application::APP_ID]);
         $this->analyze([$params['path']], Monitor::WRITE);
     }
     
diff --git a/lib/Monitor.php b/lib/Monitor.php
index dc5aa1e..b1dad47 100644
--- a/lib/Monitor.php
+++ b/lib/Monitor.php
@@ -157,7 +157,7 @@ class Monitor
         switch ($mode) {
             case self::RENAME:
                 $path = $paths[1];
-                $this->logger->error("Rename ".$paths[0]." to ".$paths[1], ['app' =>  Application::APP_ID]);
+                $this->logger->debug("Rename ".$paths[0]." to ".$paths[1], ['app' =>  Application::APP_ID]);
                 if (preg_match('/.+\.d[0-9]+/', pathinfo($paths[1])['basename']) > 0) {
                     return;
                 }
@@ -186,7 +186,7 @@ class Monitor
 
                 return;
             case self::WRITE:
-                $this->logger->error("Write ".$path, ['app' =>  Application::APP_ID]);
+                $this->logger->debug("Write ".$path, ['app' =>  Application::APP_ID]);
                 // reset PROPFIND_COUNT
                 $this->resetProfindCount();
 
@@ -216,7 +216,7 @@ class Monitor
 
                 return;
             case self::DELETE:
-                $this->logger->error("Delete", ['app' =>  Application::APP_ID]);
+                $this->logger->debug("Delete", ['app' =>  Application::APP_ID]);
                 // reset PROPFIND_COUNT
                 $this->resetProfindCount();
 
@@ -242,7 +242,7 @@ class Monitor
 
                 return;
             case self::CREATE:
-                $this->logger->error("Create", ['app' =>  Application::APP_ID]);
+                $this->logger->debug("Create", ['app' =>  Application::APP_ID]);
                 // reset PROPFIND_COUNT
                 $this->resetProfindCount();
 
@@ -402,6 +402,7 @@ class Monitor
      */
     private function addFolderOperation($paths, $node, $operation)
     {
+        $this->logger->debug("Add folder operation.", ['app' =>  Application::APP_ID]);
         $fileOperation = new FileOperation();
         $fileOperation->setUserId($this->userId);
         $fileOperation->setPath(str_replace('files', '', pathinfo($node->getInternalPath())['dirname']));
@@ -438,7 +439,7 @@ class Monitor
      */
     private function addFileOperation($paths, $node, $operation)
     {
-        $this->logger->error("Add file operation", ['app' =>  Application::APP_ID]);
+        $this->logger->debug("Add file operation.", ['app' =>  Application::APP_ID]);
         $fileOperation = new FileOperation();
         $fileOperation->setUserId($this->userId);
         $fileOperation->setPath(str_replace('files', '', pathinfo($node->getInternalPath())['dirname']));
@@ -471,8 +472,6 @@ class Monitor
         $fileOperation->setStandardDeviation($entropyResult->getStandardDeviation());
         $fileOperation->setFileClass($entropyResult->getFileClass());
 
-        $this->logger->error("Entropy ".$entropyResult->getEntropy(), ['app' =>  Application::APP_ID]);
-
         $entity = $this->mapper->insert($fileOperation);
     }
 }