Use class constants from MDConsole to MDOutputHandler

This commit is contained in:
Joshua Ramon Enslin 2020-08-08 22:23:27 +02:00 committed by Stefan Rohde-Enslin
parent bd401fa614
commit 27431ef0a0
2 changed files with 14 additions and 15 deletions

View File

@ -14,7 +14,7 @@ class MDConsole {
const STATUS_UPDATE = 1; const STATUS_UPDATE = 1;
const STATUS_DELETION = 2; const STATUS_DELETION = 2;
const STATUS_ERROR = 3; const STATUS_ERROR = 3;
const STATUS_SKIPPED = 3; const STATUS_SKIPPED = 4;
const CONSOLE_LEVEL_COLORS = [ const CONSOLE_LEVEL_COLORS = [
self::STATUS_NOTICE => "", self::STATUS_NOTICE => "",
@ -115,11 +115,7 @@ class MDConsole {
if ($duration < 30) return; if ($duration < 30) return;
toNote("Long script run", round($duration, 2), "Script run time, that's: "); self::note("Long script run" . PHP_EOL . "Script run time, that's: " . round($duration, 2) . PHP_EOL . "Peak memory usage: " . memory_get_peak_usage() . PHP_EOL . "Memory usage at end of script: " . memory_get_usage());
toNote("Long script run", memory_get_peak_usage(), "Peak memory usage");
toNote("Long script run", memory_get_usage(), "Memory usage at end of script");
# print_r($GLOBALS);
}, $startTime); }, $startTime);
} }

View File

@ -51,7 +51,7 @@ class MDOutputHandler {
* *
* @return void * @return void
*/ */
public function setVerbosity(int $input = 0) { final public function setVerbosity(int $input = 0):void {
$this->_verbosity = $input; $this->_verbosity = $input;
@ -64,7 +64,7 @@ class MDOutputHandler {
* *
* @return void * @return void
*/ */
public function setContext(string $input = "") { final public function setContext(string $input = ""):void {
$this->_context = $input; $this->_context = $input;
@ -77,7 +77,7 @@ class MDOutputHandler {
* *
* @return void * @return void
*/ */
public function setFileLogging(bool $input = false) { final public function setFileLogging(bool $input = false):void {
$this->_file_logging = $input; $this->_file_logging = $input;
@ -101,23 +101,26 @@ class MDOutputHandler {
* *
* @return void * @return void
*/ */
public function toLog(string $msg, int $statusCode = 0) { final public function toLog(string $msg, int $statusCode = 0):void {
// Get parts for generating the message to log. // Get parts for generating the message to log.
$this->_counter++; // Increment counter $this->_counter++; // Increment counter
$date = date("Y-m-d H:i:s"); // Get current date & time. $date = date("Y-m-d H:i:s"); // Get current date & time.
switch ($statusCode) { switch ($statusCode) {
case 1: case MDConsole::STATUS_SKIPPED:
$statusSymbol = "-"; $statusSymbol = "-";
break; break;
case 2: case MDConsole::STATUS_UPDATE:
$statusSymbol = "U"; $statusSymbol = "U";
break; break;
case 3: case MDConsole::STATUS_ERROR:
$statusSymbol = "E"; $statusSymbol = "E";
break; break;
case 0: case MDConsole::STATUS_DELETION:
$statusSymbol = "D";
break;
case MDConsole::STATUS_NOTICE:
default: default:
$statusSymbol = "N"; $statusSymbol = "N";
break; break;
@ -145,7 +148,7 @@ class MDOutputHandler {
/** /**
* Constructor function that sets defaults and ensures the logfile exists. * Constructor function that sets defaults and ensures the logfile exists.
*/ */
function __construct() { public function __construct() {
$this->_startTime = microtime(true); $this->_startTime = microtime(true);
$this->_counter = 0; $this->_counter = 0;