Merge pull request #1555 from PocketMine/LoggerAttachment

Implement LoggerAttachment (fixes #1547)

src/pocketmine/PocketMine.php

@@ -89,20 +89,11 @@ namespace pocketmine {
 		require_once(\pocketmine\PATH . "src/spl/SplClassLoader.php");
 	}
 
-	if(!class_exists("Logger", false)){
-		require_once(\pocketmine\PATH . "src/spl/Logger.php");
-		require_once(\pocketmine\PATH . "src/spl/LogLevel.php");
-	}
-
-	if(!class_exists("ThreadedLogger", false)){
-		require_once(\pocketmine\PATH . "src/spl/ThreadedLogger.php");
-	}
-
-
 	$autoloader = new \SplClassLoader();
-	$autoloader->add("pocketmine", array(
+	$autoloader->setMode(\SplAutoloader::MODE_DEBUG);
+	$autoloader->add("pocketmine", [
 		\pocketmine\PATH . "src"
-	));
+	]);
 
 	$autoloader->register(true);
 	if(!class_exists("raklib\\RakLib", false)){

src/pocketmine/level/generator/GenerationThread.php

@@ -52,7 +52,6 @@ class GenerationThread extends \Thread{
 		$this->loader = $loader;
 		$this->logger = $logger;
 		$loadPaths = [];
-		$this->addDependency($loadPaths, new \ReflectionClass($this->logger));
 		$this->addDependency($loadPaths, new \ReflectionClass($this->loader));
 		$this->loadPaths = array_reverse($loadPaths);
 

src/pocketmine/utils/MainLogger.php

@@ -145,6 +145,11 @@ class MainLogger extends \ThreadedLogger{
 		}else{
 			echo $message;
 		}
+
+		if($this->attachment instanceof \ThreadedLoggerAttachment){
+			$this->attachment->call($message);
+		}
+
 		$this->logStream .= date("Y-m-d", $now) . " " . $cleanMessage;
 	}
 

src/spl/AttachableLogger.php

@@ -0,0 +1,40 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+interface AttachableLogger extends \Logger{
+
+	/**
+	 * @param LoggerAttachment $attachment
+	 */
+	public function addAttachment(\LoggerAttachment $attachment);
+
+	/**
+	 * @param LoggerAttachment $attachment
+	 */
+	public function removeAttachment(\LoggerAttachment $attachment);
+
+	public function removeAttachments();
+
+	/**
+	 * @return \LoggerAttachment[]
+	 */
+	public function getAttachments();
+}

src/spl/AttachableThreadedLogger.php

@@ -0,0 +1,70 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+abstract class AttachableThreadedLogger extends \ThreadedLogger{
+
+	/** @var \ThreadedLoggerAttachment */
+	protected $attachment = null;
+
+	/**
+	 * @param ThreadedLoggerAttachment $attachment
+	 */
+	public function addAttachment(\ThreadedLoggerAttachment $attachment){
+		if($this->attachment instanceof \ThreadedLoggerAttachment){
+			$this->attachment->addAttachment($attachment);
+		}else{
+			$this->attachment = $attachment;
+		}
+	}
+
+	/**
+	 * @param ThreadedLoggerAttachment $attachment
+	 */
+	public function removeAttachment(\ThreadedLoggerAttachment $attachment){
+		if($this->attachment instanceof \ThreadedLoggerAttachment){
+			if($this->attachment === $attachment){
+				$this->attachment = null;
+				foreach($attachment->getAttachments() as $attachment){
+					$this->addAttachment($attachment);
+				}
+			}
+		}
+	}
+
+	public function removeAttachments(){
+		if($this->attachment instanceof \ThreadedLoggerAttachment){
+			$this->attachment->removeAttachments();
+			$this->attachment = null;
+		}
+	}
+
+	/**
+	 * @return \ThreadedLoggerAttachment[]
+	 */
+	public function getAttachments(){
+		$attachments = [];
+		if($this->attachment instanceof \ThreadedLoggerAttachment){
+			$attachments[] = $this->attachment;
+			$attachments += $this->attachment->getAttachments();
+		}
+		return $attachments;
+	}
+}

src/spl/LoggerAttachment.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+interface LoggerAttachment{
+
+	/**
+	 * @param string $message
+	 */
+	public function log($message);
+
+	/**
+	 * @param string $message
+	 */
+	public function call($message);
+
+}

src/spl/SplClassLoader.php

@@ -141,6 +141,14 @@ class SplClassLoader implements SplAutoloader{
 	public function load($resourceName){
 		$resourceAbsolutePath = $this->getResourceAbsolutePath($resourceName);
 		if($resourceAbsolutePath == ""){
+			if($resourceName{0} !== "\\"){
+				if(file_exists(dirname(__FILE__) ."/" . $resourceName . $this->fileExtension)){
+					require dirname(__FILE__) ."/" . $resourceName . $this->fileExtension;
+					if($this->isResourceDeclared($resourceName)){
+						return;
+					}
+				}
+			}
 			throw new \RuntimeException(
 				sprintf('Autoloader couldn\'t find a file to include for %s', $resourceName)
 			);

src/spl/ThreadedLoggerAttachment.php

@@ -0,0 +1,80 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+abstract class ThreadedLoggerAttachment extends \Threaded implements \LoggerAttachment{
+
+	/** @var \ThreadedLoggerAttachment */
+	protected $attachment = null;
+
+	/**
+	 * @param string $message
+	 */
+	public final function call($message){
+		$this->log($message);
+		if($this->attachment instanceof \ThreadedLoggerAttachment){
+			$this->attachment->call($message);
+		}
+	}
+
+	/**
+	 * @param ThreadedLoggerAttachment $attachment
+	 */
+	public function addAttachment(\ThreadedLoggerAttachment $attachment){
+		if($this->attachment instanceof \ThreadedLoggerAttachment){
+			$this->attachment->addAttachment($attachment);
+		}else{
+			$this->attachment = $attachment;
+		}
+	}
+
+	/**
+	 * @param ThreadedLoggerAttachment $attachment
+	 */
+	public function removeAttachment(\ThreadedLoggerAttachment $attachment){
+		if($this->attachment instanceof \ThreadedLoggerAttachment){
+			if($this->attachment === $attachment){
+				$this->attachment = null;
+				foreach($attachment->getAttachments() as $attachment){
+					$this->addAttachment($attachment);
+				}
+			}
+		}
+	}
+
+	public function removeAttachments(){
+		if($this->attachment instanceof \ThreadedLoggerAttachment){
+			$this->attachment->removeAttachments();
+			$this->attachment = null;
+		}
+	}
+
+	/**
+	 * @return \ThreadedLoggerAttachment[]
+	 */
+	public function getAttachments(){
+		$attachments = [];
+		if($this->attachment instanceof \ThreadedLoggerAttachment){
+			$attachments[] = $this->attachment;
+			$attachments += $this->attachment->getAttachments();
+		}
+		return $attachments;
+	}
+}