Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
MetaGer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
56
Issues
56
List
Boards
Labels
Service Desk
Milestones
Merge Requests
9
Merge Requests
9
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
open-source
MetaGer
Commits
bf837b1d
Commit
bf837b1d
authored
Jan 11, 2021
by
Dominik Hebeler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed taz logging
parent
a6fac249
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
58 deletions
+0
-58
app/Console/Commands/AppendLogs.php
app/Console/Commands/AppendLogs.php
+0
-43
app/Http/Controllers/StartpageController.php
app/Http/Controllers/StartpageController.php
+0
-15
No files found.
app/Console/Commands/AppendLogs.php
View file @
bf837b1d
...
@@ -16,7 +16,6 @@ class AppendLogs extends Command
...
@@ -16,7 +16,6 @@ class AppendLogs extends Command
*/
*/
protected
$signature
=
'logs:gather'
;
protected
$signature
=
'logs:gather'
;
const
LOGKEY
=
"metager.logs"
;
const
LOGKEY
=
"metager.logs"
;
const
LOGKEYTAZ
=
"metager.tazlogs"
;
/**
/**
* The console command description.
* The console command description.
...
@@ -43,7 +42,6 @@ class AppendLogs extends Command
...
@@ -43,7 +42,6 @@ class AppendLogs extends Command
public
function
handle
()
public
function
handle
()
{
{
$this
->
handleMGLogs
();
$this
->
handleMGLogs
();
$this
->
handleTazLogs
();
}
}
private
function
handleMGLogs
()
private
function
handleMGLogs
()
...
@@ -76,45 +74,4 @@ class AppendLogs extends Command
...
@@ -76,45 +74,4 @@ class AppendLogs extends Command
Log
::
info
(
"Added "
.
sizeof
(
$elements
)
.
" lines to todays log!"
);
Log
::
info
(
"Added "
.
sizeof
(
$elements
)
.
" lines to todays log!"
);
}
}
}
}
private
function
handleTazLogs
()
{
$redis
=
null
;
if
(
env
(
"REDIS_CACHE_DRIVER"
,
"redis"
)
===
"redis"
)
{
$redis
=
Redis
::
connection
(
'cache'
);
}
elseif
(
env
(
"REDIS_CACHE_DRIVER"
,
"redis"
)
===
"redis-sentinel"
)
{
$redis
=
RedisSentinel
::
connection
(
'cache'
);
}
if
(
$redis
===
null
)
{
Log
::
error
(
"No valid Redis Connection specified"
);
return
;
}
$elements
=
[];
$reply
=
$redis
->
pipeline
(
function
(
$pipe
)
use
(
$elements
)
{
$pipe
->
lrange
(
\
App\Console\Commands\AppendLogs
::
LOGKEYTAZ
,
0
,
-
1
);
$pipe
->
del
(
\
App\Console\Commands\AppendLogs
::
LOGKEYTAZ
);
});
$elements
=
$reply
[
0
];
if
(
!
is_array
(
$elements
)
||
sizeof
(
$elements
)
<=
0
)
{
return
;
}
if
(
file_put_contents
(
\
App\Console\Commands\AppendLogs
::
getTazLogFile
(),
implode
(
PHP_EOL
,
$elements
)
.
PHP_EOL
,
FILE_APPEND
)
===
false
)
{
Log
::
error
(
"Konnte Log Zeile(n) nicht schreiben"
);
$redis
->
lpush
(
\
App\Console\Commands\AppendLogs
::
LOGKEYTAZ
,
array_reverse
(
$elements
));
}
else
{
Log
::
info
(
"Added "
.
sizeof
(
$elements
)
.
" lines to todays TAZ log!"
);
}
}
public
static
function
getTazLogFile
()
{
$logpath
=
storage_path
(
"logs/metager/taz/"
.
date
(
"Y"
)
.
"/"
.
date
(
"m"
)
.
"/"
);
if
(
!
file_exists
(
$logpath
))
{
mkdir
(
$logpath
,
0777
,
true
);
}
$logpath
.
=
date
(
"d"
)
.
".log"
;
return
$logpath
;
}
}
}
app/Http/Controllers/StartpageController.php
View file @
bf837b1d
...
@@ -44,21 +44,6 @@ class StartpageController extends Controller
...
@@ -44,21 +44,6 @@ class StartpageController extends Controller
$lang
=
'all'
;
$lang
=
'all'
;
}
}
/**
* Logging Requests from Taz advertisement
*/
if
(
$request
->
filled
(
"key"
)
&&
$request
->
input
(
"key"
,
""
)
===
"taz"
)
{
$logEntry
=
date
(
"H:i:s"
);
$referer
=
request
()
->
headers
->
get
(
'referer'
);
$logEntry
.
=
" ref=
$referer
"
;
if
(
env
(
"REDIS_CACHE_DRIVER"
,
"redis"
)
===
"redis"
)
{
Redis
::
connection
(
'cache'
)
->
rpush
(
\
App\Console\Commands\AppendLogs
::
LOGKEYTAZ
,
$logEntry
);
}
elseif
(
env
(
"REDIS_CACHE_DRIVER"
,
"redis"
)
===
"redis-sentinel"
)
{
RedisSentinel
::
connection
(
'cache'
)
->
rpush
(
\
App\Console\Commands\AppendLogs
::
LOGKEYTAZ
,
$logEntry
);
}
}
return
view
(
'index'
)
return
view
(
'index'
)
->
with
(
'title'
,
trans
(
'titles.index'
))
->
with
(
'title'
,
trans
(
'titles.index'
))
->
with
(
'homeIcon'
)
->
with
(
'homeIcon'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment