Page MenuHomeFreeBSD
Files F157607436

D3208.id7390.diff
No OneTemporary
Actions

D3208.id7390.diff
View Options

Index: www/varnish4/Makefile
===================================================================
--- www/varnish4/Makefile
+++ www/varnish4/Makefile
@@ -2,7 +2,7 @@
PORTNAME= varnish
PORTVERSION= 4.0.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= www
MASTER_SITES= http://repo.varnish-cache.org/source/
PKGNAMESUFFIX= 4
Index: www/varnish4/files/varnishlog.in
===================================================================
--- www/varnish4/files/varnishlog.in
+++ www/varnish4/files/varnishlog.in
@@ -4,7 +4,7 @@
#
# PROVIDE: varnishlog
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON varnishd
# KEYWORD: shutdown
#
@@ -44,5 +44,30 @@
command="%%PREFIX%%/bin/${name}"
pidfile=${varnishlog_pidfile}
+start_precmd=precmd
+
+precmd()
+{
+ waitcount=0
+ vsm=%%PREFIX%%/varnish/$(hostname)/_.vsm
+
+ # wait no longer than 5s for _.vsm file to arrive from varnishd
+ while :
+ do
+ if [ -f ${vsm} ] ; then
+ break
+ else
+ case "${waitcount}" in
+ 5) echo "${name}: Failed to start. Missing ${vsm} ?"
+ break
+ ;;
+ *) echo "${name}: waiting for ${vsm}"
+ waitcount=$((waitcount+1))
+ sleep 1
+ ;;
+ esac
+ fi
+ done
+}
run_rc_command "$1"
Index: www/varnish4/files/varnishncsa.in
===================================================================
--- www/varnish4/files/varnishncsa.in
+++ www/varnish4/files/varnishncsa.in
@@ -4,7 +4,7 @@
#
# PROVIDE: varnishncsa
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON varnishd
# KEYWORD: shutdown
#
@@ -21,7 +21,7 @@
# default: "/var/log/varnishncsa.log"
#
# varnishncsa_flags - command line arguments.
-# default: "-D -P ${varnishncsa_pidfile} -a -c -w ${varnishncsa_file}${varnishncsa_logformat:+ -P \"$varnishncsa_logformat\""
+# default: "-D -P ${varnishncsa_pidfile} -a -w ${varnishncsa_file}${varnishncsa_logformat:+ -P \"$varnishncsa_logformat\""
#
# varnishncsa_logformat - log file format.
# default: "" (uses varnishncsa's default format)
@@ -45,9 +45,34 @@
: ${varnishncsa_enable:=NO}
: ${varnishncsa_pidfile=/var/run/${name}.pid}
: ${varnishncsa_file=/var/log/${name}.log}
-: ${varnishncsa_flags="-P ${varnishncsa_pidfile} -D -a -c -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}"}
+: ${varnishncsa_flags="-P ${varnishncsa_pidfile} -D -a -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}"}
command="%%PREFIX%%/bin/${name}"
pidfile=${varnishncsa_pidfile}
+start_precmd=precmd
+
+precmd()
+{
+ waitcount=0
+ vsm=%%PREFIX%%/varnish/$(hostname)/_.vsm
+
+ # wait no longer than 5s for _.vsm file to arrive from varnishd
+ while :
+ do
+ if [ -f ${vsm} ] ; then
+ break
+ else
+ case "${waitcount}" in
+ 5) echo "${name}: Failed to start. Missing ${vsm} ?"
+ break
+ ;;
+ *) echo "${name}: waiting for ${vsm}"
+ waitcount=$((waitcount+1))
+ sleep 1
+ ;;
+ esac
+ fi
+ done
+}
run_rc_command "$1"

File Metadata

Mime Type
text/plain
Expires
Sun, May 24, 8:55 AM (5 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33468162
Default Alt Text
D3208.id7390.diff (2 KB)

Event Timeline