kristuff / parselog

src/LogParser.php

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
      * @access protected
      * @var array 
      */
-    protected $patterns = [];
+    protected $patterns = [ ];
    
     /**
      * Constructor
@@ -77,7 +77,7 @@ 
      */
     public function addPattern(string $placeholder, string $pattern): void
     {
-        $this->patterns[$placeholder] = $pattern;
+        $this->patterns[ $placeholder ] = $pattern;
     }
 
     /**
@@ -103,7 +103,7 @@ 
     public function setFormat(string $format): void
     {
         // store log format update IP pattern
-        $this->logFormat = $format ;
+        $this->logFormat = $format;
         $this->updateIpPatterns();
 
         // strtr won't work for "complex" header patterns

src/Software/ApacheAccessLogParser.php

Spacing +26 added lines, -26 removed lines

@@ -54,47 +54,47 @@
         $this->addFile('apache.log');
         $this->addFile('apache_access.log');
 
-        $this->addFormat('apache_common',          '%h %l %u %t \"%r\" %>s %O"');  
-        $this->addFormat('apache_combined_vhost',  '%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"'); 
-        $this->addFormat('apache_combined',        '%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"');
+        $this->addFormat('apache_common', '%h %l %u %t \"%r\" %>s %O"');  
+        $this->addFormat('apache_combined_vhost', '%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"'); 
+        $this->addFormat('apache_combined', '%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"');
 
-        $this->addColumn('%%' , 'percent',      '',             '(?P<percent>\%)');
-        $this->addColumn('%t' , 'time',         'Date',         '\[(?P<time>\d{2}/(?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)/\d{4}:\d{2}:\d{2}:\d{2} (?:-|\+)\d{4})\]');
-        $this->addColumn('%v' , 'serverName',   'ServerName',  '(?P<serverName>([a-zA-Z0-9]+)([a-z0-9.-]*))');
-        $this->addColumn('%V' , 'canonicalServerName',  'Canonical ServerName',     '(?P<canonicalServerName>([a-zA-Z0-9]+)([a-z0-9.-]*))');
-        $this->addColumn('%p' , 'port',         'Port',         '(?P<port>\d+)');
+        $this->addColumn('%%', 'percent', '', '(?P<percent>\%)');
+        $this->addColumn('%t', 'time', 'Date', '\[(?P<time>\d{2}/(?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)/\d{4}:\d{2}:\d{2}:\d{2} (?:-|\+)\d{4})\]');
+        $this->addColumn('%v', 'serverName', 'ServerName', '(?P<serverName>([a-zA-Z0-9]+)([a-z0-9.-]*))');
+        $this->addColumn('%V', 'canonicalServerName', 'Canonical ServerName', '(?P<canonicalServerName>([a-zA-Z0-9]+)([a-z0-9.-]*))');
+        $this->addColumn('%p', 'port', 'Port', '(?P<port>\d+)');
 
         // Client IP address of the request
-        $this->addColumn('%a',  'remoteIp',     'IP',           '(?P<remoteIp>{{PATTERN_IP_ALL}})');
+        $this->addColumn('%a', 'remoteIp', 'IP', '(?P<remoteIp>{{PATTERN_IP_ALL}})');
         
         // Remote hostname
-        $this->addColumn('%h' , 'host',         'Remote Host',  '(?P<host>[a-zA-Z0-9\-\._:]+)'); 
+        $this->addColumn('%h', 'host', 'Remote Host', '(?P<host>[a-zA-Z0-9\-\._:]+)'); 
 
         // Local IP-address
-        $this->addColumn('%A',  'localIp',      'Local IP',     '(?P<localIp>{{PATTERN_IP_ALL}})');
+        $this->addColumn('%A', 'localIp', 'Local IP', '(?P<localIp>{{PATTERN_IP_ALL}})');
 
         // Remote user if the request was authenticated. May be bogus if return status (%s) is 401 (unauthorized).
-        $this->addColumn('%u',  'user',         'User',         '(?P<user>(?:-|[\w\-\.]+))');
-
-        $this->addColumn('%l', 'logname',           'Log Name',     '(?P<logname>(?:-|[\w-]+))');
-        $this->addColumn('%m', 'requestMethod',     'Method',       '(?P<requestMethod>OPTIONS|GET|HEAD|POST|PUT|DELETE|TRACE|CONNECT|PATCH|PROPFIND)');
-        $this->addColumn('%U', 'URL',               'URL',          '(?P<URL>.+?)');
-        $this->addColumn('%H', 'requestProtocol',   'Protocol',     '(?P<requestProtocol>HTTP/(1\.0|1\.1|2\.0))');
-        $this->addColumn('%r', 'request',           'Request',      '(?P<request>(?:(?:[A-Z]+) .+? HTTP/(1\.0|1\.1|2\.0))|-|)');
-        $this->addColumn('%>s','statuts',           'Status',       '(?P<status>\d{3}|-)');
-        $this->addColumn('%O', 'sentBytes',         'Size',         '(?P<sentBytes>[0-9]+)');
+        $this->addColumn('%u', 'user', 'User', '(?P<user>(?:-|[\w\-\.]+))');
+
+        $this->addColumn('%l', 'logname', 'Log Name', '(?P<logname>(?:-|[\w-]+))');
+        $this->addColumn('%m', 'requestMethod', 'Method', '(?P<requestMethod>OPTIONS|GET|HEAD|POST|PUT|DELETE|TRACE|CONNECT|PATCH|PROPFIND)');
+        $this->addColumn('%U', 'URL', 'URL', '(?P<URL>.+?)');
+        $this->addColumn('%H', 'requestProtocol', 'Protocol', '(?P<requestProtocol>HTTP/(1\.0|1\.1|2\.0))');
+        $this->addColumn('%r', 'request', 'Request', '(?P<request>(?:(?:[A-Z]+) .+? HTTP/(1\.0|1\.1|2\.0))|-|)');
+        $this->addColumn('%>s', 'statuts', 'Status', '(?P<status>\d{3}|-)');
+        $this->addColumn('%O', 'sentBytes', 'Size', '(?P<sentBytes>[0-9]+)');
     
         // Size of response in bytes, excluding HTTP headers. In CLF format, i.e. a '-' rather than a 0 when no bytes are sent.
-        $this->addColumn('%b', 'responseBytes', 'Response Size',  '(?P<responseBytes>(\d+|-))');
+        $this->addColumn('%b', 'responseBytes', 'Response Size', '(?P<responseBytes>(\d+|-))');
 
         //The time taken to serve the request, in seconds.
-        $this->addColumn('%T', 'requestTime',       'Request Time',         '(?P<requestTime>(\d+\.?\d*))');
-        $this->addColumn('%D', 'timeServeRequest',  'Time Server Request',  '(?P<timeServeRequest>[0-9]+)');
-        $this->addColumn('%I', 'receivedBytes',     'Received Bytes',       '(?P<receivedBytes>[0-9]+)');
+        $this->addColumn('%T', 'requestTime', 'Request Time', '(?P<requestTime>(\d+\.?\d*))');
+        $this->addColumn('%D', 'timeServeRequest', 'Time Server Request', '(?P<timeServeRequest>[0-9]+)');
+        $this->addColumn('%I', 'receivedBytes', 'Received Bytes', '(?P<receivedBytes>[0-9]+)');
 
         // common named columns (no pattern, use generic pattern bellow)
-        $this->addColumn('%{Referer}i',     'headerReferer',        'Referer', '');
-        $this->addColumn('%{User-Agent}i',  'headerUserAgent',      'User Agent', '');
+        $this->addColumn('%{Referer}i', 'headerReferer', 'Referer', '');
+        $this->addColumn('%{User-Agent}i', 'headerUserAgent', 'User Agent', '');
 
         // dymanic named columns
         $this->addPattern('\%\{(?P<name>[a-zA-Z]+)(?P<name2>[-]?)(?P<name3>[a-zA-Z]+)\}i', '(?P<header\\1\\3>.*?)');

src/Software/Fail2BanLogParser.php

Spacing +6 added lines, -6 removed lines

@@ -41,15 +41,15 @@
         $this->software       = 'Fail2ban';
         $this->prettyName     = 'Fail2ban';
         $this->addFormat('default', '%t %s %p %l %m');
-        $this->defaultFormat      = '%t %s %p %l %m';
+        $this->defaultFormat = '%t %s %p %l %m';
         $this->addPath("/var/log/");
         $this->addFile("fail2ban.log");
      // '%d' => '(?P<date>[\d \-,:]+)',
-        $this->addColumn('%t',  'time',         'Date',     '(?P<time>[\d \-:]+)(,\d+)');
-        $this->addColumn('%s',  'service',      'Service',  '(?P<service>[\w\d\. :]+(|\s+))');
-        $this->addColumn('%p',  'pid',          'PID',      '\[(?P<pid>\d+)\]:');
-        $this->addColumn('%l',  'level',        'Level',    '(?P<level>(Level \d+|DEBUG|INFO|NOTICE|WARNING|ERROR|CRITICAL)(|\s+))');
-        $this->addColumn('%m',  'message',      'Message',  '(?P<message>.+)');
+        $this->addColumn('%t', 'time', 'Date', '(?P<time>[\d \-:]+)(,\d+)');
+        $this->addColumn('%s', 'service', 'Service', '(?P<service>[\w\d\. :]+(|\s+))');
+        $this->addColumn('%p', 'pid', 'PID', '\[(?P<pid>\d+)\]:');
+        $this->addColumn('%l', 'level', 'Level', '(?P<level>(Level \d+|DEBUG|INFO|NOTICE|WARNING|ERROR|CRITICAL)(|\s+))');
+        $this->addColumn('%m', 'message', 'Message', '(?P<message>.+)');
 
         parent::__construct($format, $factory);
     }

src/Software/SyslogParser.php

Spacing +5 added lines, -5 removed lines

@@ -40,16 +40,16 @@
         $this->prettyName     = 'Syslog';
         
         $this->addFormat('default', '%t %h %s %m');
-        $this->defaultFormat      = '%t %h %s %m';
+        $this->defaultFormat = '%t %h %s %m';
         
         $this->addPath("/var/log/");
         $this->addFile("syslog");
         //todo
 
-        $this->addColumn('%t',  'time',         'Date',     '(?P<time>(?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) \d{2} \d{2}:\d{2}:\d{2})');
-        $this->addColumn('%h',  'hostaname',    'Hostname', '(?P<hostname>.+?)');
-        $this->addColumn('%s',  'service',      'Service',  '(?P<service>(\S+|\[\d+\])):');
-        $this->addColumn('%m',  'message',      'Message',  '(?P<message>.+)');
+        $this->addColumn('%t', 'time', 'Date', '(?P<time>(?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) \d{2} \d{2}:\d{2}:\d{2})');
+        $this->addColumn('%h', 'hostaname', 'Hostname', '(?P<hostname>.+?)');
+        $this->addColumn('%s', 'service', 'Service', '(?P<service>(\S+|\[\d+\])):');
+        $this->addColumn('%m', 'message', 'Message', '(?P<message>.+)');
 
         parent::__construct($format, $factory);
     }

src/Software/SoftwareLogParser.php

Spacing +15 added lines, -15 removed lines

@@ -53,12 +53,12 @@ 
     /** 
      * @var array 
      */
-    protected $knownFormats = [];
+    protected $knownFormats = [ ];
 
     /** 
      * @var array 
      */
-    protected $columns = [];
+    protected $columns = [ ];
 
     /** 
      * The log file names
@@ -66,7 +66,7 @@ 
      * @access protected
      * @var array 
      */
-    protected $files = [];
+    protected $files = [ ];
 
     /** 
      * The log file paths
@@ -74,7 +74,7 @@ 
      * @access protected
      * @var array 
      */
-    protected $paths = [];
+    protected $paths = [ ];
 
     /**
      * Constructor
@@ -125,7 +125,7 @@ 
      */
     protected function addFormat(string $name, string $format): void
     {
-        $this->knownFormats[$name] = $format;
+        $this->knownFormats[ $name ] = $format;
     }
 
     /**
@@ -150,7 +150,7 @@ 
      */
     protected function addFile(string $fileName): void
     {
-        $this->files[] = $fileName;
+        $this->files[ ] = $fileName;
     }
 
     /**
@@ -176,7 +176,7 @@ 
      */
     protected function addPath(string $path): void
     {
-        $this->paths[] = $path;
+        $this->paths[ ] = $path;
     }
 
     /**
@@ -205,7 +205,7 @@ 
      */
     protected function addColumn(string $placeholder, string $propertyName, string $prettyName, string $pattern, bool $required = true): void
     {
-        $this->columns[] = [
+        $this->columns[ ] = [
             'placeholder'   => $placeholder,
             'propertyName'  => $propertyName,
             'prettyName'    => $prettyName,
@@ -213,15 +213,15 @@ 
             'required'      => $required,
         ];
 
-        if (!empty($pattern)){
+        if (!empty($pattern)) {
 
             // optional columns ?
             // adjust pattern for nullable columns and add space after placeholder
             // - $format = '%t %l %P %E: %a %M';
             // + $format = '%t %l (%P )?(%E: )?(%a )?%M';
             $this->addPattern( 
-                $required ? $placeholder : $placeholder . ' ' , 
-                $required ? $pattern     : '(' . $pattern . ' )?' 
+                $required ? $placeholder : $placeholder.' ', 
+                $required ? $pattern : '('.$pattern.' )?' 
             );
         }
     }
@@ -235,10 +235,10 @@ 
      */
     public function getColumns()
     {
-        $cols = [];
-        foreach ($this->columns as $column){
-            if (strpos($this->getFormat(), $column['placeholder']) !== false){
-                $cols[] = $column;
+        $cols = [ ];
+        foreach ($this->columns as $column) {
+            if (strpos($this->getFormat(), $column[ 'placeholder' ]) !== false) {
+                $cols[ ] = $column;
             }
         }
         return $cols;

src/Software/ApacheErrorLogParser.php

Spacing +7 added lines, -7 removed lines

@@ -69,22 +69,22 @@
         $this->addFile('error_log');
         $this->addFile("apache_error.log"); 
 
-        $this->addColumn('%%' , 'percent',      '',             '(?P<percent>\%)');
-        $this->addColumn('%t' , 'time',         'Date',         '\[(?P<time>(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun) (?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) \d{2} \d{2}:\d{2}:\d{2}(\.\d{6}|) \d{4})\]');
+        $this->addColumn('%%', 'percent', '', '(?P<percent>\%)');
+        $this->addColumn('%t', 'time', 'Date', '\[(?P<time>(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun) (?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) \d{2} \d{2}:\d{2}:\d{2}(\.\d{6}|) \d{4})\]');
         
         // %a 	Client IP address and port of the request 
-        $this->addColumn('%a' , 'remoteIP',     'IP',           '\[client (?P<remoteIp>{{PATTERN_IP_ALL}})(:[\d]+|)\]', false);
+        $this->addColumn('%a', 'remoteIP', 'IP', '\[client (?P<remoteIp>{{PATTERN_IP_ALL}})(:[\d]+|)\]', false);
         
-        $this->addColumn('%A',  'localIP',      'Local IP',      '(?P<localIp>{{PATTERN_IP_ALL}})', false);
+        $this->addColumn('%A', 'localIP', 'Local IP', '(?P<localIp>{{PATTERN_IP_ALL}})', false);
         
         // %l 	Loglevel of the message
-        $this->addColumn('%l', 'level',         'Level',        '\[(?P<level>[\w:]+)\]');
+        $this->addColumn('%l', 'level', 'Level', '\[(?P<level>[\w:]+)\]');
 
         // %P 	Process ID of current process (since apache 2.4?)
-        $this->addColumn('%P',  'pid',           'PID',          '\[pid (?P<pid>\d+)\]', false);
+        $this->addColumn('%P', 'pid', 'PID', '\[pid (?P<pid>\d+)\]', false);
         
         // %E 	APR/OS error status code and string
-        $this->addColumn('%E:' , 'errorCode',   'Error',        '(?P<errorCode>[\w\d\s:]+):', false);              
+        $this->addColumn('%E:', 'errorCode', 'Error', '(?P<errorCode>[\w\d\s:]+):', false);              
 
         // %M 	The actual log message
         $this->addColumn('%M', 'message', 'Message', '(?P<message>.+?)');

src/LogParserFactory.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
      */
     public static function getParser(string $logType, string $format = null, LogEntryFactoryInterface $factory = null): ?SoftwareLogParser 
     {
-        switch ($logType){
+        switch ($logType) {
 
             case self::TYPE_APACHE_ACCESS: 
                 return new \Kristuff\Parselog\Software\ApacheAccessLogParser($format, $factory);