|
41 | 41 | use Monolog\Logger;
|
42 | 42 | use Ramsey\Uuid\Uuid;
|
43 | 43 |
|
44 |
| - |
45 | 44 | $system = System::getSystem();
|
46 |
| -$logger = new Logger('kernel'); |
| 45 | +$logger = configureLogger($system); |
47 | 46 |
|
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 | +} |
49 | 54 |
|
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'); |
52 | 76 | $logger->pushHandler(
|
53 | 77 | new FingersCrossedHandler((Logger::DEBUG === $loggerActivationStrategy)
|
54 | 78 | ? (new GroupHandler([
|
55 |
| - new SyslogHandler('jupyter-php'), |
| 79 | + new RotatingFileHandler($system->getAppDataDirectory() . '/logs/error.log', 7), |
56 | 80 | new StreamHandler('php://stderr')
|
57 | 81 | ]))
|
58 |
| - : (new SyslogHandler('jupyter-php')), |
| 82 | + : (new RotatingFileHandler($system->getAppDataDirectory() . '/logs/error.log', 7)), |
59 | 83 | $loggerActivationStrategy,
|
60 | 84 | 128
|
61 | 85 | )
|
62 | 86 | );
|
63 | 87 | }
|
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 |
| -} |
78 | 88 |
|
| 89 | + return $logger; |
| 90 | +} |
79 | 91 |
|
80 |
| -try { |
| 92 | +function startCore(Logger $logger) |
| 93 | +{ |
81 | 94 | // Obtain settings
|
82 | 95 | $connectionSettings = ConnectionSettings::get();
|
83 | 96 | $connUris = ConnectionSettings::getConnectionUris($connectionSettings);
|
|
100 | 113 | );
|
101 | 114 |
|
102 | 115 | $kernelCore->run();
|
103 |
| -} catch(\Error $e) { |
104 |
| - $logger->error('Unexpected error', ['error' => $e]); |
105 |
| -}catch (\Exception $e) { |
106 |
| - $logger->error('Unexpected exception', ['exception' => $e]); |
107 | 116 | }
|
0 commit comments