Author: glen                         Date: Thu Feb 11 13:04:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more verbose error in configtest

---- Files affected:
packages/varnish:
   varnish.init (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: packages/varnish/varnish.init
diff -u packages/varnish/varnish.init:1.15 packages/varnish/varnish.init:1.16
--- packages/varnish/varnish.init:1.15  Mon Jan 25 23:44:27 2010
+++ packages/varnish/varnish.init       Thu Feb 11 14:04:54 2010
@@ -58,7 +58,13 @@
        if [ -f /var/lock/subsys/varnish ]; then
                vcl_load $vcl_label ${VARNISH_VCL_CONF}; rc=$?
                # discard only if above succeeded
-               [ $rc = 0 ] && vcl_discard $vcl_label || rc=$?
+               if [ $rc = 0 ]; then
+                       vcl_discard $vcl_label || rc=$?
+               else
+                       # this will display a bit more verbose error
+                       /usr/sbin/varnishd -C -f ${VARNISH_VCL_CONF} >/dev/null
+               fi
+
        else
                echo "Varnish is not running, config cannot be tested"
        fi
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/varnish/varnish.init?r1=1.15&r2=1.16&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to