Make VSL_Open not open the shmlog if run with -r

c3aac583 · Tollef Fog Heen · f535d862 · c3aac583
Commit c3aac583 authored Aug 01, 2011 by Tollef Fog Heen
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

vsl.c lib/libvarnishapi/vsl.c +5 -3

No files found.
--- a/lib/libvarnishapi/vsl.c
+++ b/lib/libvarnishapi/vsl.c
@@ -375,9 +375,11 @@ VSL_Open(struct VSM_data *vd, int diag)
 	vsl = vd->vsl;
 	CHECK_OBJ_NOTNULL(vsl, VSL_MAGIC);

-	i = VSM_Open(vd, diag);
-	if (i)
-		return (i);
+	if (vsl->r_fd == -1) {
+		i = VSM_Open(vd, diag);
+		if (i)
+			return (i);
+	}

 	if (!vsl->d_opt && vsl->r_fd == -1) {
 		while (*vsl->log_ptr != VSL_ENDMARKER)