|
@@ -62,11 +62,11 @@ discard block |
|
|
block discarded – undo |
|
62
|
62
|
|
|
63
|
63
|
if (
|
|
64
|
64
|
empty($log) ||
|
|
65
|
|
- ( isset($log['enabled']) && $log['enabled'] === false ) ||
|
|
|
65
|
+ (isset($log['enabled']) && $log['enabled'] === false) ||
|
|
66
|
66
|
empty($log['providers'])
|
|
67
|
67
|
) {
|
|
68
|
68
|
|
|
69
|
|
- $logger->pushHandler( new NullHandler( self::getLevel() ) );
|
|
|
69
|
+ $logger->pushHandler(new NullHandler(self::getLevel()));
|
|
70
|
70
|
|
|
71
|
71
|
} else {
|
|
72
|
72
|
|
|
@@ -74,7 +74,7 @@ discard block |
|
|
block discarded – undo |
|
74
|
74
|
|
|
75
|
75
|
$handler = $this->getHandler($provider, $parameters);
|
|
76
|
76
|
|
|
77
|
|
- if ( $handler instanceof HandlerInterface ) $logger->pushHandler($handler);
|
|
|
77
|
+ if ($handler instanceof HandlerInterface) $logger->pushHandler($handler);
|
|
78
|
78
|
|
|
79
|
79
|
}
|
|
80
|
80
|
|
|
@@ -101,7 +101,7 @@ discard block |
|
|
block discarded – undo |
|
101
|
101
|
|
|
102
|
102
|
protected function getHandler($provider, $parameters) {
|
|
103
|
103
|
|
|
104
|
|
- switch ( $parameters['type'] ) {
|
|
|
104
|
+ switch ($parameters['type']) {
|
|
105
|
105
|
|
|
106
|
106
|
case 'StreamHandler':
|
|
107
|
107
|
$handler = $this->getStreamHandler($provider, $parameters);
|
|
@@ -129,13 +129,13 @@ discard block |
|
|
block discarded – undo |
|
129
|
129
|
|
|
130
|
130
|
$stream = $this->configuration->get('base-path').'/'.(empty($parameters['stream']) ? 'dispatcher.log' : $parameters['stream']);
|
|
131
|
131
|
|
|
132
|
|
- $level = self::getLevel( empty($parameters['level']) ? null : $parameters['level'] );
|
|
|
132
|
+ $level = self::getLevel(empty($parameters['level']) ? null : $parameters['level']);
|
|
133
|
133
|
|
|
134
|
|
- $bubble = self::getBubble( empty($parameters['bubble']) ? true : $parameters['bubble'] );
|
|
|
134
|
+ $bubble = self::getBubble(empty($parameters['bubble']) ? true : $parameters['bubble']);
|
|
135
|
135
|
|
|
136
|
|
- $filePermission = self::getFilePermission( empty($parameters['filePermission']) ? null : $parameters['filePermission'] );
|
|
|
136
|
+ $filePermission = self::getFilePermission(empty($parameters['filePermission']) ? null : $parameters['filePermission']);
|
|
137
|
137
|
|
|
138
|
|
- $useLocking = self::getLocking( empty($parameters['useLocking']) ? false : $parameters['useLocking'] );
|
|
|
138
|
+ $useLocking = self::getLocking(empty($parameters['useLocking']) ? false : $parameters['useLocking']);
|
|
139
|
139
|
|
|
140
|
140
|
return new StreamHandler($stream, $level, $bubble, $filePermission, $useLocking);
|
|
141
|
141
|
|
|
@@ -143,13 +143,13 @@ discard block |
|
|
block discarded – undo |
|
143
|
143
|
|
|
144
|
144
|
protected function getSyslogHandler($name, $parameters) {
|
|
145
|
145
|
|
|
146
|
|
- if ( empty($parameters['ident']) ) return null;
|
|
|
146
|
+ if (empty($parameters['ident'])) return null;
|
|
147
|
147
|
|
|
148
|
148
|
$facility = empty($parameters['facility']) ? LOG_USER : $parameters['facility'];
|
|
149
|
149
|
|
|
150
|
|
- $level = self::getLevel( empty($parameters['level']) ? null : $parameters['level'] );
|
|
|
150
|
+ $level = self::getLevel(empty($parameters['level']) ? null : $parameters['level']);
|
|
151
|
151
|
|
|
152
|
|
- $bubble = self::getBubble( empty($parameters['bubble']) ? true : $parameters['bubble'] );
|
|
|
152
|
+ $bubble = self::getBubble(empty($parameters['bubble']) ? true : $parameters['bubble']);
|
|
153
|
153
|
|
|
154
|
154
|
$logopts = empty($parameters['logopts']) ? LOG_PID : $parameters['logopts'];
|
|
155
|
155
|
|
|
@@ -161,11 +161,11 @@ discard block |
|
|
block discarded – undo |
|
161
|
161
|
|
|
162
|
162
|
$messageType = empty($parameters['messageType']) ? ErrorLogHandler::OPERATING_SYSTEM : $parameters['messageType'];
|
|
163
|
163
|
|
|
164
|
|
- $level = self::getLevel( empty($parameters['level']) ? null : $parameters['level'] );
|
|
|
164
|
+ $level = self::getLevel(empty($parameters['level']) ? null : $parameters['level']);
|
|
165
|
165
|
|
|
166
|
|
- $bubble = self::getBubble( empty($parameters['bubble']) ? true : $parameters['bubble'] );
|
|
|
166
|
+ $bubble = self::getBubble(empty($parameters['bubble']) ? true : $parameters['bubble']);
|
|
167
|
167
|
|
|
168
|
|
- $expandNewlines = self::getExpandNewlines( empty($parameters['expandNewlines']) ? false : $parameters['expandNewlines'] );
|
|
|
168
|
+ $expandNewlines = self::getExpandNewlines(empty($parameters['expandNewlines']) ? false : $parameters['expandNewlines']);
|
|
169
|
169
|
|
|
170
|
170
|
return new ErrorLogHandler($messageType, $level, $bubble, $expandNewlines);
|
|
171
|
171
|
|
|
@@ -182,7 +182,7 @@ discard block |
|
|
block discarded – undo |
|
182
|
182
|
|
|
183
|
183
|
$level = strtoupper($level);
|
|
184
|
184
|
|
|
185
|
|
- if ( array_key_exists($level, self::$levels) ) return self::$levels[$level];
|
|
|
185
|
+ if (array_key_exists($level, self::$levels)) return self::$levels[$level];
|
|
186
|
186
|
|
|
187
|
187
|
return self::$levels['DEBUG'];
|
|
188
|
188
|
|
|
@@ -200,7 +200,7 @@ discard block |
|
|
block discarded – undo |
|
200
|
200
|
|
|
201
|
201
|
protected static function getFilePermission($filepermission = null) {
|
|
202
|
202
|
|
|
203
|
|
- if ( is_null($filepermission) ) return null;
|
|
|
203
|
+ if (is_null($filepermission)) return null;
|
|
204
|
204
|
|
|
205
|
205
|
return filter_var($filepermission, FILTER_VALIDATE_INT, array(
|
|
206
|
206
|
'options' => array(
|
comodojo /
dispatcher.framework
