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
4b92808b
Commit
4b92808b
authored
Jul 30, 2015
by
Maxime
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add syslog support for log and errors directives
parent
ec51e144
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
2 deletions
+16
-2
config/setup/errors.go
config/setup/errors.go
+8
-1
config/setup/log.go
config/setup/log.go
+8
-1
No files found.
config/setup/errors.go
View file @
4b92808b
...
...
@@ -2,11 +2,13 @@ package setup
import
(
"fmt"
"io"
"log"
"os"
"path"
"strconv"
"github.com/hashicorp/go-syslog"
"github.com/mholt/caddy/middleware"
"github.com/mholt/caddy/middleware/errors"
)
...
...
@@ -21,12 +23,17 @@ func Errors(c *Controller) (middleware.Middleware, error) {
// Open the log file for writing when the server starts
c
.
Startup
=
append
(
c
.
Startup
,
func
()
error
{
var
err
error
var
file
*
os
.
File
var
file
io
.
Writer
if
handler
.
LogFile
==
"stdout"
{
file
=
os
.
Stdout
}
else
if
handler
.
LogFile
==
"stderr"
{
file
=
os
.
Stderr
}
else
if
handler
.
LogFile
==
"syslog"
{
file
,
err
=
gsyslog
.
NewLogger
(
gsyslog
.
LOG_ERR
,
"SYSLOG"
,
"caddy"
)
if
err
!=
nil
{
return
err
}
}
else
if
handler
.
LogFile
!=
""
{
file
,
err
=
os
.
OpenFile
(
handler
.
LogFile
,
os
.
O_RDWR
|
os
.
O_CREATE
|
os
.
O_APPEND
,
0644
)
if
err
!=
nil
{
...
...
config/setup/log.go
View file @
4b92808b
package
setup
import
(
"io"
"log"
"os"
"github.com/hashicorp/go-syslog"
"github.com/mholt/caddy/middleware"
caddylog
"github.com/mholt/caddy/middleware/log"
"github.com/mholt/caddy/server"
...
...
@@ -20,12 +22,17 @@ func Log(c *Controller) (middleware.Middleware, error) {
c
.
Startup
=
append
(
c
.
Startup
,
func
()
error
{
for
i
:=
0
;
i
<
len
(
rules
);
i
++
{
var
err
error
var
file
*
os
.
File
var
file
io
.
Writer
if
rules
[
i
]
.
OutputFile
==
"stdout"
{
file
=
os
.
Stdout
}
else
if
rules
[
i
]
.
OutputFile
==
"stderr"
{
file
=
os
.
Stderr
}
else
if
rules
[
i
]
.
OutputFile
==
"syslog"
{
file
,
err
=
gsyslog
.
NewLogger
(
gsyslog
.
LOG_NOTICE
,
"SYSLOG"
,
"caddy"
)
if
err
!=
nil
{
return
err
}
}
else
{
file
,
err
=
os
.
OpenFile
(
rules
[
i
]
.
OutputFile
,
os
.
O_RDWR
|
os
.
O_CREATE
|
os
.
O_APPEND
,
0644
)
if
err
!=
nil
{
...
...
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