|
@@ -47,13 +47,13 @@ discard block |
|
|
block discarded – undo |
|
47
|
47
|
|
|
48
|
48
|
if (
|
|
49
|
49
|
empty($log) ||
|
|
50
|
|
- ( isset($log['enabled']) && $log['enabled'] === false ) ||
|
|
|
50
|
+ (isset($log['enabled']) && $log['enabled'] === false) ||
|
|
51
|
51
|
empty($log['providers'])
|
|
52
|
52
|
) {
|
|
53
|
53
|
|
|
54
|
54
|
$logger = new Logger('dispatcher');
|
|
55
|
55
|
|
|
56
|
|
- $logger->pushHandler( new NullHandler( self::getLevel() ) );
|
|
|
56
|
+ $logger->pushHandler(new NullHandler(self::getLevel()));
|
|
57
|
57
|
|
|
58
|
58
|
} else {
|
|
59
|
59
|
|
|
@@ -65,7 +65,7 @@ discard block |
|
|
block discarded – undo |
|
65
|
65
|
|
|
66
|
66
|
$handler = $this->getHandler($provider, $parameters);
|
|
67
|
67
|
|
|
68
|
|
- if ( $handler instanceof HandlerInterface ) $logger->pushHandler($handler);
|
|
|
68
|
+ if ($handler instanceof HandlerInterface) $logger->pushHandler($handler);
|
|
69
|
69
|
|
|
70
|
70
|
}
|
|
71
|
71
|
|
|
@@ -92,19 +92,19 @@ discard block |
|
|
block discarded – undo |
|
92
|
92
|
|
|
93
|
93
|
protected function getHandler($provider, $parameters) {
|
|
94
|
94
|
|
|
95
|
|
- switch ( $parameters['type'] ) {
|
|
|
95
|
+ switch ($parameters['type']) {
|
|
96
|
96
|
|
|
97
|
97
|
case 'StreamHandler':
|
|
98
|
98
|
|
|
99
|
99
|
$stream = $this->configuration->get('base-path').'/'.(empty($parameters['stream']) ? 'dispatcher.log' : $parameters['stream']);
|
|
100
|
100
|
|
|
101
|
|
- $level = self::getLevel( empty($parameters['level']) ? null : $parameters['level'] );
|
|
|
101
|
+ $level = self::getLevel(empty($parameters['level']) ? null : $parameters['level']);
|
|
102
|
102
|
|
|
103
|
|
- $bubble = self::getBubble( empty($parameters['bubble']) ? true : $parameters['bubble'] );
|
|
|
103
|
+ $bubble = self::getBubble(empty($parameters['bubble']) ? true : $parameters['bubble']);
|
|
104
|
104
|
|
|
105
|
|
- $filePermission = self::getFilePermission( empty($parameters['filePermission']) ? null : $parameters['filePermission'] );
|
|
|
105
|
+ $filePermission = self::getFilePermission(empty($parameters['filePermission']) ? null : $parameters['filePermission']);
|
|
106
|
106
|
|
|
107
|
|
- $useLocking = self::getLocking( empty($parameters['useLocking']) ? false : $parameters['useLocking'] );
|
|
|
107
|
+ $useLocking = self::getLocking(empty($parameters['useLocking']) ? false : $parameters['useLocking']);
|
|
108
|
108
|
|
|
109
|
109
|
$handler = new StreamHandler($stream, $level, $bubble, $filePermission, $useLocking);
|
|
110
|
110
|
|
|
@@ -112,13 +112,13 @@ discard block |
|
|
block discarded – undo |
|
112
|
112
|
|
|
113
|
113
|
case 'SyslogHandler':
|
|
114
|
114
|
|
|
115
|
|
- if ( empty($parameters['ident']) ) return null;
|
|
|
115
|
+ if (empty($parameters['ident'])) return null;
|
|
116
|
116
|
|
|
117
|
117
|
$facility = empty($parameters['facility']) ? LOG_USER : $parameters['facility'];
|
|
118
|
118
|
|
|
119
|
|
- $level = self::getLevel( empty($parameters['level']) ? null : $parameters['level'] );
|
|
|
119
|
+ $level = self::getLevel(empty($parameters['level']) ? null : $parameters['level']);
|
|
120
|
120
|
|
|
121
|
|
- $bubble = self::getBubble( empty($parameters['bubble']) ? true : $parameters['bubble'] );
|
|
|
121
|
+ $bubble = self::getBubble(empty($parameters['bubble']) ? true : $parameters['bubble']);
|
|
122
|
122
|
|
|
123
|
123
|
$logopts = empty($parameters['logopts']) ? LOG_PID : $parameters['logopts'];
|
|
124
|
124
|
|
|
@@ -130,11 +130,11 @@ discard block |
|
|
block discarded – undo |
|
130
|
130
|
|
|
131
|
131
|
$messageType = empty($parameters['messageType']) ? ErrorLogHandler::OPERATING_SYSTEM : $parameters['messageType'];
|
|
132
|
132
|
|
|
133
|
|
- $level = self::getLevel( empty($parameters['level']) ? null : $parameters['level'] );
|
|
|
133
|
+ $level = self::getLevel(empty($parameters['level']) ? null : $parameters['level']);
|
|
134
|
134
|
|
|
135
|
|
- $bubble = self::getBubble( empty($parameters['bubble']) ? true : $parameters['bubble'] );
|
|
|
135
|
+ $bubble = self::getBubble(empty($parameters['bubble']) ? true : $parameters['bubble']);
|
|
136
|
136
|
|
|
137
|
|
- $expandNewlines = self::getExpandNewlines( empty($parameters['expandNewlines']) ? false : $parameters['expandNewlines'] );
|
|
|
137
|
+ $expandNewlines = self::getExpandNewlines(empty($parameters['expandNewlines']) ? false : $parameters['expandNewlines']);
|
|
138
|
138
|
|
|
139
|
139
|
$handler = new ErrorLogHandler($messageType, $level, $bubble, $expandNewlines);
|
|
140
|
140
|
|
|
@@ -158,7 +158,7 @@ discard block |
|
|
block discarded – undo |
|
158
|
158
|
*/
|
|
159
|
159
|
protected static function getLevel($level = null) {
|
|
160
|
160
|
|
|
161
|
|
- switch ( strtoupper($level) ) {
|
|
|
161
|
+ switch (strtoupper($level)) {
|
|
162
|
162
|
|
|
163
|
163
|
case 'INFO':
|
|
164
|
164
|
$logger_level = Logger::INFO;
|
|
@@ -211,7 +211,7 @@ discard block |
|
|
block discarded – undo |
|
211
|
211
|
|
|
212
|
212
|
protected static function getFilePermission($filepermission = null) {
|
|
213
|
213
|
|
|
214
|
|
- if ( is_null($filepermission) ) return null;
|
|
|
214
|
+ if (is_null($filepermission)) return null;
|
|
215
|
215
|
|
|
216
|
216
|
return filter_var($filepermission, FILTER_VALIDATE_INT, array(
|
|
217
|
217
|
'options' => array(
|
comodojo /
dispatcher.framework
