Skip to content
This repository was archived by the owner on Dec 27, 2023. It is now read-only.

Commit bdef2bf

Browse files
committed
Minor code cleanups
1 parent 3135a1e commit bdef2bf

File tree

4 files changed

+48
-6
lines changed

4 files changed

+48
-6
lines changed

src/JupyterBroker.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function send(
6969
);
7070

7171
if (null !== $this->logger) {
72-
$this->logger->debug('Sent message', ['processId' => posix_getpid(), 'message/' => $finalMsg]);
72+
$this->logger->debug('Sent message', ['processId' => posix_getpid(), 'message' => $finalMsg]);
7373
}
7474

7575
$stream->send($finalMsg);

src/KernelOutput.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ public function __construct(ExecuteAction $executeAction, LoggerInterface $logge
4848
*/
4949
public function write($messages, $newline = false, $options = self::OUTPUT_NORMAL)
5050
{
51-
$this->logger->debug('Write operation inside KernelOutput');
52-
5351
$types = self::OUTPUT_NORMAL | self::OUTPUT_RAW | self::OUTPUT_PLAIN;
5452
$type = $types & $options ?: self::OUTPUT_NORMAL;
5553

@@ -201,6 +199,16 @@ private function initFormatters()
201199
$formatter->setStyle('urgent', new OutputFormatterStyle('red'));
202200
$formatter->setStyle('hidden', new OutputFormatterStyle('white'));
203201

202+
// Visibility
203+
$formatter->setStyle('public', new OutputFormatterStyle(null, null, array('bold')));
204+
$formatter->setStyle('protected', new OutputFormatterStyle('yellow'));
205+
$formatter->setStyle('private', new OutputFormatterStyle('red'));
206+
$formatter->setStyle('global', new OutputFormatterStyle('cyan', null, array('bold')));
207+
$formatter->setStyle('const', new OutputFormatterStyle('cyan'));
208+
$formatter->setStyle('class', new OutputFormatterStyle('blue', null, array('underscore')));
209+
$formatter->setStyle('function', new OutputFormatterStyle(null));
210+
$formatter->setStyle('default', new OutputFormatterStyle(null));
211+
204212
// Types
205213
$formatter->setStyle('number', new OutputFormatterStyle('magenta'));
206214
$formatter->setStyle('string', new OutputFormatterStyle('green'));

src/LoggerSettings.php

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?php
2+
3+
4+
namespace Litipk\JupyterPHP;
5+
6+
7+
use Monolog\Logger;
8+
9+
10+
final class LoggerSettings
11+
{
12+
/**
13+
* @return int
14+
*/
15+
public static function getCrossFingersLevel()
16+
{
17+
global $argv;
18+
if (!isset($argv) || empty($argv)) {
19+
$argv = $_SERVER['argv'];
20+
}
21+
22+
if (is_array($argv) && count($argv) > 2) {
23+
return ('debug' === trim(strtolower($argv[2]))) ? Logger::DEBUG : Logger::WARNING;
24+
} else {
25+
return Logger::WARNING;
26+
}
27+
}
28+
}

src/kernel.php

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bn/env php
1+
#!/usr/bin/env php
22
<?php
33

44

@@ -20,15 +20,21 @@
2020
$system = System::getSystem();
2121
$logger = new Logger('kernel');
2222

23+
$loggerActivationStrategy = new ErrorLevelActivationStrategy(LoggerSettings::getCrossFingersLevel());
24+
2325
if ('root' === $system->getCurrentUser()) {
2426
if (System::OS_LINUX === $system->getOperativeSystem()) {
25-
$logger->pushHandler(new FingersCrossedHandler(new SyslogHandler('jupyter-php'), null, 128));
27+
$logger->pushHandler(new FingersCrossedHandler(
28+
new SyslogHandler('jupyter-php'),
29+
$loggerActivationStrategy,
30+
128
31+
));
2632
}
2733
} else {
2834
$system->ensurePath($system->getAppDataDirectory().'/logs');
2935
$logger->pushHandler(new FingersCrossedHandler(
3036
new RotatingFileHandler($system->getAppDataDirectory().'/logs/error.log', 7),
31-
new ErrorLevelActivationStrategy(Logger::DEBUG),
37+
$loggerActivationStrategy,
3238
128
3339
));
3440
}

0 commit comments

Comments
 (0)