Merge branch 'master' of github.com:cloudflare/cloudflare-plugin-backend

cloudflare · Jun 14, 2016 · 54f702b · 54f702b
2 parents 9f9d46b + 1cf580b
commit 54f702b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 34 deletions.
diff --git a/src/API/AbstractAPIClient.php b/src/API/AbstractAPIClient.php
@@ -60,23 +60,36 @@ public function callAPI(Request $request)
             }
 
             if (!$this->responseOk($response)) {
-                $this->logger->logAPICall($this->getAPIClientName(), array('type' => 'response', 'body' => $response), false);
+                $this->logAPICall($this->getAPIClientName(), array('type' => 'response', 'body' => $response), true);
             }
 
             return $response;
         } catch (RequestException $e) {
-            $this->logger->logAPICall($this->getAPIClientName(), array(
+            $this->logAPICall($this->getAPIClientName(), array(
                 'type' => "request",
                 'method' => $request->getMethod(),
                 'path' => $request->getUrl(),
                 'headers' => $request->getHeaders(),
                 'params' => $request->getParameters(),
-                'body' => $request->getBody()), false);
-            $this->logger->logAPICall($this->getAPIClientName(), array('type' => "response", 'code' => $e->getCode(), 'body' => $e->getMessage(), 'stacktrace' => $e->getTraceAsString()), false);
+                'body' => $request->getBody()), true);
+            $this->logAPICall($this->getAPIClientName(), array('type' => "response", 'code' => $e->getCode(), 'body' => $e->getMessage(), 'stacktrace' => $e->getTraceAsString()), true);
             return $this->createAPIError($e->getMessage());
         }
     }
 
+    public function logAPICall($api, $message, $isError) {
+        $logLevel = "error";
+        if ($isError === false) {
+            $logLevel = "debug";
+        }
+
+        if (!is_string($message)) {
+            $message = print_r($message, true);
+        }
+
+        $this->logger->$logLevel("[" . $api . "] " . $message);
+    }
+
 
     /**
      * @param Request $request

diff --git a/src/Integration/DefaultIntegration.php b/src/Integration/DefaultIntegration.php
@@ -2,6 +2,7 @@
 
 namespace CF\Integration;
 
+use \Psr\Log\LoggerInterface;
 
 class DefaultIntegration implements IntegrationInterface
 {
@@ -14,7 +15,7 @@ class DefaultIntegration implements IntegrationInterface
      * @param ConfigInterface $config
      * @param IntegrationAPIInterface $integrationAPI
      * @param DataStoreInterface $dataStore
-     * @param LoggerInterface $logger
+     * @param LoggerInterface|\Psr\Log\LoggerInterface $logger
      */
     public function __construct(ConfigInterface $config, IntegrationAPIInterface $integrationAPI, DataStoreInterface $dataStore, LoggerInterface $logger)
     {

diff --git a/src/Integration/DefaultLogger.php b/src/Integration/DefaultLogger.php
@@ -3,6 +3,7 @@
 
 use \Psr\Log\AbstractLogger;
 use \Psr\Log\LogLevel;
+use \Psr\Log\LoggerInterface;
 
 class DefaultLogger extends AbstractLogger implements LoggerInterface
 {
@@ -46,19 +47,4 @@ public function debug($message, array $context = array())
            return $this->log(LogLevel::DEBUG, $message, $context);
         }
     }
-
-    public function logAPICall($api, $message, $is_debug)
-    {
-
-        $log_level = "error";
-        if ($is_debug) {
-            $log_level = "debug";
-        }
-
-        if (!is_string($message)) {
-            $message = print_r($message, true);
-        }
-
-        $this->$log_level("[" . $api . "] " . $message);
-    }
 }
diff --git a/src/Integration/LoggerInterface.php b/src/Integration/LoggerInterface.php