Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/Docnet/JAPI.php

Merging changes from Docnet master branch

Author: kazsaj

src/Docnet/JAPI.php

@@ -37,14 +37,19 @@ class JAPI
     private static $obj_config = NULL;
 
     /**
-     * @var null
+     * @var JAPI\Router
      */
-    private static $flt_startup = NULL;
+    private static $obj_router = NULL;
 
     /**
-     * @var \Docnet\JAPI\Router
+     * @var JAPI\Logger
      */
-    private static $obj_router = NULL;
+    private $obj_logger = NULL;
+
+    /**
+     * @var null|float
+     */
+    private static $flt_startup = NULL;
 
     /**
      * When creating a new JAPI, hook up the shutdown function and set Config
@@ -82,7 +87,6 @@ public function run()
      * Custom shutdown function
      *
      * @todo Consider checking if headers have already been sent
-     * @todo Consider checking isLive before outputting message
      */
     public function timeToDie()
     {
@@ -115,17 +119,19 @@ protected function jsonError($mix_message = NULL, $int_code = 500)
                 header($_SERVER["SERVER_PROTOCOL"] . " 500 Internal Server Error", TRUE, 500);
         }
         if ($mix_message instanceof \Exception) {
-            $str_message = (self::getConfig()->isLive() ? 'Exception' : get_class($mix_message) . ': ' . $mix_message->getMessage());
+            $str_log = get_class($mix_message) . ': ' . $mix_message->getMessage();
+            $str_message = self::getConfig()->isLive() ? 'Exception' : $str_log;
         } elseif (is_string($mix_message)) {
-            $str_message = $mix_message;
+            $str_log = $str_message = $mix_message;
         } else {
-            $str_message = 'Unknown error';
+            $str_log = $str_message = 'Unknown error';
         }
         header('Content-type: application/json');
         echo json_encode(array(
             'response' => (int)$int_code,
             'msg' => $str_message
         ));
+        $this->log(LOG_ERR, "[JAPI exiting with {$int_code}] " . $str_log);
         exit();
     }
 
@@ -137,7 +143,7 @@ protected function jsonError($mix_message = NULL, $int_code = 500)
     public static function getRouter()
     {
         if (NULL === self::$obj_router) {
-            self::$obj_router = new \Docnet\JAPI\Router();
+            self::$obj_router = new JAPI\Router();
         }
         return self::$obj_router;
     }
@@ -147,7 +153,7 @@ public static function getRouter()
      *
      * @param JAPI\Interfaces\Router $obj_router
      */
-    public function setRouter(\Docnet\JAPI\Interfaces\Router $obj_router)
+    public function setRouter(JAPI\Interfaces\Router $obj_router)
     {
         self::$obj_router = $obj_router;
     }
@@ -176,4 +182,28 @@ public static function getDuration($int_dp = 4)
         return round(microtime(TRUE) - self::$flt_startup, $int_dp);
     }
 
+    /**
+     * Log to the current Logger, create one if needed
+     *
+     * @param $int_level
+     * @param $str_message
+     */
+    protected function log($int_level, $str_message)
+    {
+        if(NULL === $this->obj_logger) {
+            $this->obj_logger = new JAPI\Logger();
+        }
+        $this->obj_logger->log($int_level, $str_message);
+    }
+
+    /**
+     * Set a custom Logger
+     *
+     * @param JAPI\Interfaces\Logger $obj_logger
+     */
+    public function setLogger(JAPI\Interfaces\Logger $obj_logger)
+    {
+        $this->obj_logger = $obj_logger;
+    }
+
 }

src/Docnet/JAPI/Controller.php

@@ -99,6 +99,16 @@ protected function getBody()
         return file_get_contents('php://input');
     }
 
+    /**
+     * Get the request body as a JSON object
+     *
+     * @return mixed
+     */
+    protected function getJson()
+    {
+        return json_decode($this->getBody());
+    }
+
     /**
      * Get a request parameter. Check GET then POST data.
      *

src/Docnet/JAPI/Interfaces/Logger.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright 2014 Docnet
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+namespace Docnet\JAPI\Interfaces;
+
+/**
+ * JAPI Logger Interface
+ *
+ * @author Tom Walder <[email protected]>
+ */
+interface Logger
+{
+
+    /**
+     * Log a message
+     *
+     * @param $int_level
+     * @param $str_message
+     */
+    public function log($int_level, $str_message);
+
+}

src/Docnet/JAPI/Logger.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright 2014 Docnet
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+namespace Docnet\JAPI;
+/**
+ * JAPI Logger
+ *
+ * @author Tom Walder <[email protected]>
+ */
+class Logger implements Interfaces\Logger
+{
+
+    /**
+     * Default PHP log levels as strings
+     *
+     * @var array
+     */
+    protected $arr_levels = array(
+        LOG_EMERG => 'EMERG',
+        LOG_ALERT => 'ALERT',
+        LOG_CRIT => 'CRIT',
+        LOG_ERR => 'ERR',
+        LOG_WARNING => 'WARNING',
+        LOG_NOTICE => 'NOTICE',
+        LOG_INFO => 'INFO',
+        LOG_DEBUG => 'DEBUG'
+    );
+
+    /**
+     * Log a message
+     *
+     * @param $int_level
+     * @param $str_message
+     */
+    public function log($int_level, $str_message)
+    {
+        if(!isset($this->arr_levels[$int_level])) {
+            $int_level = LOG_ERR;
+        }
+        syslog($int_level, $str_message);
+        error_log("[{$this->arr_levels[$int_level]}] {$str_message}");
+    }
+
+}