mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-07-04 09:10:00 +00:00
Added ThreadedLoggerAttachments
This commit is contained in:
parent
f7c23e89f0
commit
75d2409a7c
@ -95,6 +95,7 @@ namespace pocketmine {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(!class_exists("ThreadedLogger", false)){
|
if(!class_exists("ThreadedLogger", false)){
|
||||||
|
require_once(\pocketmine\PATH . "src/spl/ThreadedLoggerAttachment.php");
|
||||||
require_once(\pocketmine\PATH . "src/spl/ThreadedLogger.php");
|
require_once(\pocketmine\PATH . "src/spl/ThreadedLogger.php");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -145,6 +145,11 @@ class MainLogger extends \ThreadedLogger{
|
|||||||
}else{
|
}else{
|
||||||
echo $message;
|
echo $message;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if($this->attachment instanceof \ThreadedLoggerAttachment){
|
||||||
|
$this->attachment->call($message);
|
||||||
|
}
|
||||||
|
|
||||||
$this->logStream .= date("Y-m-d", $now) . " " . $cleanMessage;
|
$this->logStream .= date("Y-m-d", $now) . " " . $cleanMessage;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -21,4 +21,50 @@
|
|||||||
|
|
||||||
abstract class ThreadedLogger extends \Thread implements Logger{
|
abstract class ThreadedLogger extends \Thread implements Logger{
|
||||||
|
|
||||||
|
/** @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;
|
||||||
|
}
|
||||||
}
|
}
|
85
src/spl/ThreadedLoggerAttachment.php
Normal file
85
src/spl/ThreadedLoggerAttachment.php
Normal file
@ -0,0 +1,85 @@
|
|||||||
|
<?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{
|
||||||
|
|
||||||
|
/** @var \ThreadedLoggerAttachment */
|
||||||
|
protected $attachment = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $message
|
||||||
|
*/
|
||||||
|
protected abstract function log($message);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @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;
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user