Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
our_own_cloud_project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
die_coolen_jungs
our_own_cloud_project
Commits
ddcd7383
Commit
ddcd7383
authored
12 years ago
by
Victor Dubiniuk
Browse files
Options
Downloads
Plain Diff
Merge branch 'extended_log'
PHP errors logging into the owncloud log
parents
e6c9f5d9
2b6869bc
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/base.php
+4
-0
4 additions, 0 deletions
lib/base.php
lib/log.php
+22
-0
22 additions, 0 deletions
lib/log.php
with
26 additions
and
0 deletions
lib/base.php
+
4
−
0
View file @
ddcd7383
...
...
@@ -323,6 +323,10 @@ class OC{
self
::
initPaths
();
register_shutdown_function
(
array
(
'OC_Log'
,
'onShutdown'
));
set_error_handler
(
array
(
'OC_Log'
,
'onError'
));
set_exception_handler
(
array
(
'OC_Log'
,
'onException'
));
// set debug mode if an xdebug session is active
if
(
!
defined
(
'DEBUG'
)
||
!
DEBUG
)
{
if
(
isset
(
$_COOKIE
[
'XDEBUG_SESSION'
]))
{
...
...
This diff is collapsed.
Click to expand it.
lib/log.php
+
22
−
0
View file @
ddcd7383
...
...
@@ -39,4 +39,26 @@ class OC_Log {
$log_class
::
write
(
$app
,
$message
,
$level
);
}
}
//Fatal errors handler
public
static
function
onShutdown
(){
$error
=
error_get_last
();
if
(
$error
)
{
//ob_end_clean();
self
::
write
(
'PHP'
,
$error
[
'message'
]
.
' at '
.
$error
[
'file'
]
.
'#'
.
$error
[
'line'
],
self
::
FATAL
);
}
else
{
return
true
;
}
}
// Uncaught exception handler
public
static
function
onException
(
$exception
){
self
::
write
(
'PHP'
,
$exception
->
getMessage
()
.
' at '
.
$exception
->
getFile
()
.
'#'
.
$exception
->
getLine
(),
self
::
FATAL
);
}
//Recoverable errors handler
public
static
function
onError
(
$number
,
$message
,
$file
,
$line
){
self
::
write
(
'PHP'
,
$message
.
' at '
.
$file
.
'#'
.
$line
,
self
::
WARN
);
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment