Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Łukasz Nowak
caddy
Commits
9b74901b
Commit
9b74901b
authored
9 years ago
by
Matthew Holt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
errors: Fix file paths for error pages & empty log filenames
parent
78e6d7db
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
middleware/errors/errors.go
middleware/errors/errors.go
+3
-1
No files found.
middleware/errors/errors.go
View file @
9b74901b
...
...
@@ -7,6 +7,7 @@ import (
"log"
"net/http"
"os"
"path"
"strconv"
"github.com/mholt/caddy/middleware"
...
...
@@ -28,7 +29,7 @@ func New(c middleware.Controller) (middleware.Middleware, error) {
file
=
os
.
Stdout
}
else
if
handler
.
LogFile
==
"stderr"
{
file
=
os
.
Stderr
}
else
{
}
else
if
handler
.
LogFile
!=
""
{
file
,
err
=
os
.
OpenFile
(
handler
.
LogFile
,
os
.
O_RDWR
|
os
.
O_CREATE
|
os
.
O_APPEND
,
0644
)
if
err
!=
nil
{
return
err
...
...
@@ -131,6 +132,7 @@ func parse(c middleware.Controller) (ErrorHandler, error) {
handler
.
LogFile
=
where
}
else
{
// Error page; ensure it exists
where
=
path
.
Join
(
c
.
Root
(),
where
)
f
,
err
:=
os
.
Open
(
where
)
if
err
!=
nil
{
return
hadBlock
,
c
.
Err
(
"Unable to open error page '"
+
where
+
"': "
+
err
.
Error
())
...
...
This diff is collapsed.
Click to expand it.
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