Inject logger

appinfo/application.php

@@ -37,6 +37,7 @@ class Application extends App {
 			return new SessionController(
 				$c->query('AppName'), 
 				$c->query('Request'),
+				$c->query('Logger'),
 				$c->query('UserId')
 			);
 		});
@@ -54,6 +55,7 @@ class Application extends App {
 				$c->query('AppName'), 
 				$c->query('Request'),
 				$c->query('CoreConfig'),
+				$c->query('Logger'),
 				$c->query('L10N'),
 				$c->query('UserId')
 			);
@@ -62,7 +64,9 @@ class Application extends App {
 		/**
 		 * Core
 		 */
-		
+		$container->registerService('Logger', function($c) {
+			return $c->query('ServerContainer')->getLogger();
+		});
         $container->registerService('CoreConfig', function($c) {
             return $c->query('ServerContainer')->getConfig();
         });

appinfo/routes.php

@@ -26,7 +26,7 @@ $application->registerRoutes($this, array(
 		array('name' => 'session#poll', 'url' => 'ajax/otpoll.php', 'verb' => 'POST'),
 		//documents
 		array('name' => 'document#create', 'url' => 'ajax/documents/create', 'verb' => 'POST'),
-		array('name' => 'document#serve', 'url' => 'ajax/genesis/{esId}', 'verb' => array('GET', 'HEAD')),
+		array('name' => 'document#serve', 'url' => 'ajax/genesis/{esId}', 'verb' => 'GET', 'HEAD'),
 		array('name' => 'document#rename', 'url' => 'ajax/documents/rename/{fileId}', 'verb' => 'POST'),
 		array('name' => 'document#listAll', 'url' => 'ajax/documents/list', 'verb' => 'GET'),
 		array('name' => 'document#download', 'url' => 'ajax/download.php', 'verb' => array('GET', 'HEAD')),

controller/sessioncontroller.php

@@ -38,10 +38,12 @@ class BadRequestException extends \Exception {
 class SessionController extends Controller{
 	
 	protected $uid;
+	protected $logger;
 
-	public function __construct($appName, IRequest $request, $uid){
+	public function __construct($appName, IRequest $request, $logger, $uid){
 		parent::__construct($appName, $request);
 		$this->uid = $uid;
+		$this->logger = $logger;
 	}
 	
 	/**
@@ -62,7 +64,7 @@ class SessionController extends Controller{
 				array('status'=>'success')
 			);
 		} catch (\Exception $e){
-			Helper::warnLog('Starting a session failed. Reason: ' . $e->getMessage());
+			$this->logger->warning('Starting a session failed. Reason: ' . $e->getMessage(), array('app' => $this->appName));
 			$response = array (
 				'status'=>'error'
 			);
@@ -94,7 +96,7 @@ class SessionController extends Controller{
 					array('status'=>'success')
 			);
 		} catch (\Exception $e){
-			Helper::warnLog('Starting a session failed. Reason: ' . $e->getMessage());
+			$this->logger->warning('Starting a session failed. Reason: ' . $e->getMessage(), array('app' => $this->appName));
 			$response = array (
 				'status'=>'error'
 			);
@@ -123,7 +125,7 @@ class SessionController extends Controller{
 			try {
 				$file = new File($session->getFileId());
 			} catch (\Exception $e){
-				Helper::warnLog('Error. Session no longer exists. ' . $e->getMessage());
+				$this->logger->warning('Error. Session no longer exists. ' . $e->getMessage(), array('app' => $this->appName));
 				$ex = new BadRequestException();
 				$ex->setBody(
 						implode(',', $this->request->getParams())
@@ -302,7 +304,7 @@ class SessionController extends Controller{
 				// Not a last user
 				if ($memberCount>0){
 					// Update genesis hash to prevent conflicts
-					Helper::debugLog('Update hash');
+					$this->logger->debug('Update hash', array('app' => $this->appName));
 					$session->updateGenesisHash($esId, sha1($data['content']));
 				} else {
 					// Last user. Kill session data
@@ -313,7 +315,7 @@ class SessionController extends Controller{
 			}
 			$response = array('status'=>'success');
 		} catch (\Exception $e){
-			Helper::warnLog('Saving failed. Reason:' . $e->getMessage());
+			$this->logger->warning('Saving failed. Reason:' . $e->getMessage(), array('app' => $this->appName));
 			\OC_Response::setStatus(500);
 			$response = array();
 		}

controller/settingscontroller.php

@@ -19,19 +19,20 @@ use \OCP\AppFramework\Http\JSONResponse;
 
 use OCA\Documents\Converter;
 use OCA\Documents\Config;
-use OCA\Documents\Helper;
 use OCA\Documents\Filter;
 
 class SettingsController extends Controller{
 	
 	private $uid;
 	private $settings;
+	private $logger;
 	private $l10n;
 	
-	public function __construct($appName, IRequest $request, IConfig $settings, IL10N $l10n, $uid){
+	public function __construct($appName, IRequest $request, IConfig $settings, $logger, IL10N $l10n, $uid){
 		parent::__construct($appName, $request);
 		$this->uid = $uid;
 		$this->settings = $settings;
+		$this->logger = $logger;
 		$this->l10n = $l10n;
 	}
 	
@@ -98,7 +99,7 @@ class SettingsController extends Controller{
 		
 		if ($this->settings->getAppValue($this->appName, 'converter', 'local') != 'local'){
 			if (!Converter::checkConnection()){
-				Helper::warnLog('Bad response from Format Filter Server');
+				$this->logger->warning('Bad response from Format Filter Server', array('app' => $this->appName));
 					$response = array(
 						'status' => 'error',
 						'data'=>
@@ -108,7 +109,6 @@ class SettingsController extends Controller{
 		} else {
 			try {
 				if (!Config::testConversion()){
-					Helper::warnLog('Conversion failed. Raw output:' . $result);
 					$response = array( 
 						'status' => 'error',
 						'data'=>

lib/config.php

@@ -44,6 +44,7 @@ wAAAQACAAAAAAAAAAAAAAAAAAAAAAACAAAAAtXN1ZwuGxCTlwgAKyz5rkQAAAAF1c3VnC4bEJOXCAArL
  		$exists = file_exists($outfile);
 		
 		if (!$exists){
+			Helper::warnLog('Conversion test failed. Raw output:' . $result);
 			return false;
 		} else {
 			unlink($outfile);