diff --git a/.idea/php.xml b/.idea/php.xml
index 6afb87d..fbb0ae1 100755
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -318,14 +318,14 @@
-
+
-
+
diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml
index d9fac3b..0b92a43 100755
--- a/.idea/phpunit.xml
+++ b/.idea/phpunit.xml
@@ -4,10 +4,10 @@
diff --git a/code/app/Providers/AppServiceProvider.php b/code/app/Providers/AppServiceProvider.php
index 539b2ee..adfa6a7 100755
--- a/code/app/Providers/AppServiceProvider.php
+++ b/code/app/Providers/AppServiceProvider.php
@@ -26,18 +26,6 @@ class AppServiceProvider extends ServiceProvider
*/
public function boot()
{
- if(config('app.env') === 'production') {
- //\URL::forceScheme('https');
- }else {
- //\URL::forceScheme('https');
- }
-
- /*
- LogViewer::auth(function ($request) {
- return $request->user()
- && $request->user()->email == 'splin94@yandex.ru';
- });
- */
-
+ LogViewer::extend('synology', SynologySSLog::class);
}
}
diff --git a/code/app/Providers/SynologySSLog.php b/code/app/Providers/SynologySSLog.php
new file mode 100755
index 0000000..ca2d31b
--- /dev/null
+++ b/code/app/Providers/SynologySSLog.php
@@ -0,0 +1,44 @@
+[^\]]+)\] (?P\S+)\.(?P\S+): ?(\|(?\S+)\|)? (?P.*)? (\{(?\S+)\}) ?(\[(?\S+|)\])?/';
+ public static string $regex = '/^\[(?P[^\]]+)\] (?P\S+)\.(?P\S+): ?(\|(?\S+)\|)? (?P.*)? ((?(\{\S+\})|(\[\]))) ((?(\{\S+\})|(\[\])))/';
+
+ /** @var array|\string[][] The columns displayed on the frontend, and which data they should display */
+ public static array $columns = [
+ ['label' => 'Datetime', 'data_path' => 'datetime'],
+ ['label' => 'Level', 'data_path' => 'level'],
+ ['label' => 'Pid', 'data_path' => 'context.pid'],
+ ['label' => 'Message', 'data_path' => 'context.message'],
+ ['label' => 'Data', 'data_path' => 'context.data'],
+ ];
+
+ public function fillMatches(array $matches = []): void
+ {
+ // The parent class already handles the "datetime", "level" and "message" matches. But you're free to assign them yourself.
+ parent::fillMatches($matches);
+
+ $this->context = [
+ 'datetime' => $matches['datetime'],
+ 'environment' => $matches['environment'],
+ 'level' => $matches['level'],
+ 'pid' => $matches['pid'],
+ 'message' => $matches['message'],
+ 'data' => $matches['data'],
+ 'extra' => $matches['extra'],
+ ];
+ }
+
+}
diff --git a/code/composer.json b/code/composer.json
index 5780412..d3745d0 100755
--- a/code/composer.json
+++ b/code/composer.json
@@ -8,7 +8,7 @@
],
"license": "MIT",
"require": {
- "php": "^7.2.5|^8.0",
+ "php": "^8.0",
"erlandmuchasaj/laravel-file-uploader": "^1.0",
"faisal50x/query-filter": "^1.0",
"fruitcake/laravel-cors": "dev-develop",
diff --git a/code/config/log-viewer.php b/code/config/log-viewer.php
index 77464a4..d217e81 100755
--- a/code/config/log-viewer.php
+++ b/code/config/log-viewer.php
@@ -131,7 +131,8 @@ return [
'include_files' => [
#'/var/www/storage/SynologySStoTelegram/**/*.log'
- '/var/www/storage/*/*.log'
+ '/var/www/storage/*/*.log',
+ '/var/www/storage/synology/*.log'
],
/*
diff --git a/code/storage/database.sqlite b/code/storage/database.sqlite
index 3539d2b..f675148 100755
Binary files a/code/storage/database.sqlite and b/code/storage/database.sqlite differ