Skip to content

default log format + fix logging #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
luckyraul wants to merge 1 commit into
base: master
Choose a base branch
from
Open

default log format + fix logging #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifests/instance.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
$purge_acls = ['"localhost"'],
$varnishlog = false,
$varnishncsa = false,
$ncsa_log_format = '-f',
$ncsa_log_format = '%h %l %u %t "%r" %s %b "%{Referer}i" "%{User-agent}i"',
$logdir = '/var/log/varnish',
$vmods = [],
$vmod_deps = [],
Expand Down
4 changes: 2 additions & 2 deletions templates/sysvinit/varnishncsa.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ PIDFILE=/var/run/varnishncsa/$NAME.pid
LOGFILE=<%= @logdir %>/$NAME.log
LOGFORMAT='<%= @ncsa_log_format %>'
USER=varnishlog
DAEMON_OPTS="-n <%= @instance %> ${LOGFORMAT} -a -w ${LOGFILE} -D -P ${PIDFILE}"
DAEMON_OPTS="-n <%= @instance %> -a -w ${LOGFILE} -D -P ${PIDFILE}"

# Include defaults if available
if [ -f /etc/default/$NAME ] ; then
Expand All @@ -42,7 +42,7 @@ start_varnishncsa() {
log_daemon_msg "Starting $DESC" "$NAME"
create_pid_directory
if start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
--chuid $USER --exec ${DAEMON} -- ${DAEMON_OPTS} \
--chuid $USER --exec ${DAEMON} -- ${DAEMON_OPTS} -F "${LOGFORMAT}" \
> ${output} 2>&1; then
log_end_msg 0
else
Expand Down