[master] 6a11be319 Do not attempt to remove the vcl dir if we need the shared object

Nils Goroll nils.goroll at uplex.de
Mon Aug 17 14:26:07 UTC 2020


commit 6a11be31975d6db7cdcd6aff7e45d153e8c023d9
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Mon Aug 17 16:22:51 2020 +0200

    Do not attempt to remove the vcl dir if we need the shared object
    
    This avoids a bogus message
    
            Could not rmdir 'vcl_...': Directory not empty

diff --git a/bin/varnishd/mgt/mgt_vcc.c b/bin/varnishd/mgt/mgt_vcc.c
index 0b85cbd93..729804b5a 100644
--- a/bin/varnishd/mgt/mgt_vcc.c
+++ b/bin/varnishd/mgt/mgt_vcc.c
@@ -283,10 +283,11 @@ mgt_vcc_fini_vp(struct vcc_priv *vp, int leave_lib)
 	if (!MGT_DO_DEBUG(DBG_VCL_KEEP)) {
 		VJ_unlink(VSB_data(vp->csrcfile));
 		VJ_unlink(VSB_data(vp->symfile));
-		if (!leave_lib)
+		if (!leave_lib) {
 			VJ_unlink(VSB_data(vp->libfile));
+			VJ_rmdir(VSB_data(vp->dir));
+		}
 	}
-	VJ_rmdir(VSB_data(vp->dir));
 	VSB_destroy(&vp->csrcfile);
 	VSB_destroy(&vp->libfile);
 	VSB_destroy(&vp->symfile);


More information about the varnish-commit mailing list