Skip to content

Commit 2ae08eb

Browse files
author
Andrés Correa Casablanca
committed
Extract two functions in kernel.php
1 parent f5340ba commit 2ae08eb

File tree

1 file changed

+35
-26
lines changed

1 file changed

+35
-26
lines changed

src/kernel.php

+35-26
Original file line numberDiff line numberDiff line change
@@ -41,43 +41,56 @@
4141
use Monolog\Logger;
4242
use Ramsey\Uuid\Uuid;
4343

44-
4544
$system = System::getSystem();
46-
$logger = new Logger('kernel');
45+
$logger = configureLogger($system);
4746

48-
$loggerActivationStrategy = new ErrorLevelActivationStrategy(LoggerSettings::getCrossFingersLevel());
47+
try {
48+
startCore($logger);
49+
} catch(\Error $e) {
50+
$logger->error('Unexpected error', ['error' => $e]);
51+
} catch (\Exception $e) {
52+
$logger->error('Unexpected exception', ['exception' => $e]);
53+
}
4954

50-
if ('root' === $system->getCurrentUser()) {
51-
if (System::OS_LINUX === $system->getOperativeSystem()) {
55+
function configureLogger(System $system): Logger
56+
{
57+
$logger = new Logger('kernel');
58+
$loggerActivationStrategy = new ErrorLevelActivationStrategy(LoggerSettings::getCrossFingersLevel());
59+
60+
if ('root' === $system->getCurrentUser()) {
61+
if (System::OS_LINUX === $system->getOperativeSystem()) {
62+
$logger->pushHandler(
63+
new FingersCrossedHandler((Logger::DEBUG === $loggerActivationStrategy)
64+
? (new GroupHandler([
65+
new SyslogHandler('jupyter-php'),
66+
new StreamHandler('php://stderr')
67+
]))
68+
: (new SyslogHandler('jupyter-php')),
69+
$loggerActivationStrategy,
70+
128
71+
)
72+
);
73+
}
74+
} else {
75+
$system->ensurePath($system->getAppDataDirectory() . '/logs');
5276
$logger->pushHandler(
5377
new FingersCrossedHandler((Logger::DEBUG === $loggerActivationStrategy)
5478
? (new GroupHandler([
55-
new SyslogHandler('jupyter-php'),
79+
new RotatingFileHandler($system->getAppDataDirectory() . '/logs/error.log', 7),
5680
new StreamHandler('php://stderr')
5781
]))
58-
: (new SyslogHandler('jupyter-php')),
82+
: (new RotatingFileHandler($system->getAppDataDirectory() . '/logs/error.log', 7)),
5983
$loggerActivationStrategy,
6084
128
6185
)
6286
);
6387
}
64-
} else {
65-
$system->ensurePath($system->getAppDataDirectory().'/logs');
66-
$logger->pushHandler(
67-
new FingersCrossedHandler((Logger::DEBUG === $loggerActivationStrategy)
68-
? (new GroupHandler([
69-
new RotatingFileHandler($system->getAppDataDirectory().'/logs/error.log', 7),
70-
new StreamHandler('php://stderr')
71-
]))
72-
: (new RotatingFileHandler($system->getAppDataDirectory().'/logs/error.log', 7)),
73-
$loggerActivationStrategy,
74-
128
75-
)
76-
);
77-
}
7888

89+
return $logger;
90+
}
7991

80-
try {
92+
function startCore(Logger $logger)
93+
{
8194
// Obtain settings
8295
$connectionSettings = ConnectionSettings::get();
8396
$connUris = ConnectionSettings::getConnectionUris($connectionSettings);
@@ -100,8 +113,4 @@
100113
);
101114

102115
$kernelCore->run();
103-
} catch(\Error $e) {
104-
$logger->error('Unexpected error', ['error' => $e]);
105-
}catch (\Exception $e) {
106-
$logger->error('Unexpected exception', ['exception' => $e]);
107116
}

0 commit comments

Comments
 (0)