Add logging wiki docs, add store information in logs.

oyeaussie · oyeaussie · commit 5e7923063caa · 2024-08-14T12:12:54.000+10:00
diff --git a/docs/wiki b/docs/wiki
@@ -1 +1 @@
-Subproject commit 801fd5bbf58f2c0c7a47845c8f27abce2d15718b
+Subproject commit 21aa6f51196c5b09a9846795f056e0d4ac397217
diff --git a/src/Firewall.php b/src/Firewall.php
@@ -887,7 +887,7 @@ public function checkIp($ip = null, array $overrideIp2locationLookupSequence = n
             $this->addResponse('Allowed', 0, ['default_filter' => true, 'filter' => $filter]);
 
             if ($this->config['log_filter_allowed'] === true) {
-                $this->filterLogger->notice('ALLOWED', ['ip' => $this->ip, 'filter_id' => $filter['id']]);
+                $this->filterLogger->notice('ALLOWED', ['ip' => $this->ip, 'filters_store'=> 'default', 'filter_id' => $filter['id']]);
             }
 
             return true;
@@ -898,7 +898,7 @@ public function checkIp($ip = null, array $overrideIp2locationLookupSequence = n
                 return true;
             }
 
-            $this->filterLogger->notice('BLOCKED', ['ip' => $this->ip, 'filter_id' => $filter['id']]);
+            $this->filterLogger->notice('BLOCKED', ['ip' => $this->ip, 'filters_store'=> 'default', 'filter_id' => $filter['id']]);
 
             $this->addResponse('Blocked', 1, ['default_filter' => true, 'filter' => $filter]);
 
@@ -971,7 +971,7 @@ protected function checkIPFilter($filter, $ip = false, $defaultStore = false)
             }
 
             if ($status === 'Allowed' && $this->config['log_filter_allowed'] === true) {
-                $this->filterLogger->notice('ALLOWED', ['ip' => $this->ip, 'filter_id' => $filter['id']]);
+                $this->filterLogger->notice('ALLOWED', ['ip' => $this->ip, 'filters_store'=> 'main', 'filter_id' => $filter['id']]);
             }
 
             $this->addResponse($status, $code, ['default_filter' => $defaultStore, 'filter' => $filter]);
@@ -993,7 +993,7 @@ protected function checkIPFilter($filter, $ip = false, $defaultStore = false)
             $filter['parent_filter'] = $parentFilter;
         }
 
-        $this->filterLogger->notice('BLOCKED', ['ip' => $this->ip, 'filter_id' => $filter['id']]);
+        $this->filterLogger->notice('BLOCKED', ['ip' => $this->ip, 'filters_store'=> 'main', 'filter_id' => $filter['id']]);
 
         $this->addResponse('Blocked', 1, ['default_filter' => $defaultStore, 'filter' => $filter]);
 

Original file line number	Diff line number	Diff line change
`@@ -887,7 +887,7 @@ public function checkIp($ip = null, array $overrideIp2locationLookupSequence = n`
`887`	`887`	`$this->addResponse('Allowed', 0, ['default_filter' => true, 'filter' => $filter]);`
`888`	`888`
`889`	`889`	`if ($this->config['log_filter_allowed'] === true) {`
`890`		`- $this->filterLogger->notice('ALLOWED', ['ip' => $this->ip, 'filter_id' => $filter['id']]);`
	`890`	`+ $this->filterLogger->notice('ALLOWED', ['ip' => $this->ip, 'filters_store'=> 'default', 'filter_id' => $filter['id']]);`
`891`	`891`	`}`
`892`	`892`
`893`	`893`	`return true;`
`@@ -898,7 +898,7 @@ public function checkIp($ip = null, array $overrideIp2locationLookupSequence = n`
`898`	`898`	`return true;`
`899`	`899`	`}`
`900`	`900`
`901`		`- $this->filterLogger->notice('BLOCKED', ['ip' => $this->ip, 'filter_id' => $filter['id']]);`
	`901`	`+ $this->filterLogger->notice('BLOCKED', ['ip' => $this->ip, 'filters_store'=> 'default', 'filter_id' => $filter['id']]);`
`902`	`902`
`903`	`903`	`$this->addResponse('Blocked', 1, ['default_filter' => true, 'filter' => $filter]);`
`904`	`904`
`@@ -971,7 +971,7 @@ protected function checkIPFilter($filter, $ip = false, $defaultStore = false)`
`971`	`971`	`}`
`972`	`972`
`973`	`973`	`if ($status === 'Allowed' && $this->config['log_filter_allowed'] === true) {`
`974`		`- $this->filterLogger->notice('ALLOWED', ['ip' => $this->ip, 'filter_id' => $filter['id']]);`
	`974`	`+ $this->filterLogger->notice('ALLOWED', ['ip' => $this->ip, 'filters_store'=> 'main', 'filter_id' => $filter['id']]);`
`975`	`975`	`}`
`976`	`976`
`977`	`977`	`$this->addResponse($status, $code, ['default_filter' => $defaultStore, 'filter' => $filter]);`
`@@ -993,7 +993,7 @@ protected function checkIPFilter($filter, $ip = false, $defaultStore = false)`
`993`	`993`	`$filter['parent_filter'] = $parentFilter;`
`994`	`994`	`}`
`995`	`995`
`996`		`- $this->filterLogger->notice('BLOCKED', ['ip' => $this->ip, 'filter_id' => $filter['id']]);`
	`996`	`+ $this->filterLogger->notice('BLOCKED', ['ip' => $this->ip, 'filters_store'=> 'main', 'filter_id' => $filter['id']]);`
`997`	`997`
`998`	`998`	`$this->addResponse('Blocked', 1, ['default_filter' => $defaultStore, 'filter' => $filter]);`
`999`	`999`