[master] 35cadf113 s:NULL backend:None backend:
Nils Goroll
nils.goroll at uplex.de
Mon Jan 18 15:18:08 UTC 2021
commit 35cadf1132a6934e52895874c5134730276d1268
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Mon Jan 18 14:50:50 2021 +0100
s:NULL backend:None backend:
diff --git a/bin/varnishtest/tests/d00030.vtc b/bin/varnishtest/tests/d00030.vtc
index c458a6b37..9238f83c0 100644
--- a/bin/varnishtest/tests/d00030.vtc
+++ b/bin/varnishtest/tests/d00030.vtc
@@ -185,7 +185,7 @@ varnish v1 -errvcl {vmod_directors: shard shard: .backend(resolve=NOW) can not b
}
}
-varnish v1 -errvcl {vmod_directors: shard shard: NULL backend cannot be added}{
+varnish v1 -errvcl {vmod_directors: shard shard: None backend cannot be added}{
import directors;
backend dummy None;
diff --git a/bin/varnishtest/tests/r02036.vtc b/bin/varnishtest/tests/r02036.vtc
index f6bfcfcc3..caa1876e0 100644
--- a/bin/varnishtest/tests/r02036.vtc
+++ b/bin/varnishtest/tests/r02036.vtc
@@ -7,7 +7,7 @@ server s1 {
varnish v1 -vcl+backend {} -start
-varnish v1 -errvcl "NULL backend cannot be added" {
+varnish v1 -errvcl "None backend cannot be added" {
import directors;
probe cacheprobe {
diff --git a/bin/varnishtest/tests/v00060.vtc b/bin/varnishtest/tests/v00060.vtc
index 28bbcb89f..c01abc809 100644
--- a/bin/varnishtest/tests/v00060.vtc
+++ b/bin/varnishtest/tests/v00060.vtc
@@ -1,4 +1,4 @@
-varnishtest "NULL backend allowed"
+varnishtest "None backend allowed"
server s1 {
rxreq
diff --git a/vmod/vmod_directors.c b/vmod/vmod_directors.c
index c9ed4fc57..09f18719e 100644
--- a/vmod/vmod_directors.c
+++ b/vmod/vmod_directors.c
@@ -137,7 +137,7 @@ vdir_add_backend(VRT_CTX, struct vdir *vd, VCL_BACKEND be, double weight)
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
CHECK_OBJ_NOTNULL(vd, VDIR_MAGIC);
if (be == NULL) {
- VRT_fail(ctx, "%s: NULL backend cannot be added",
+ VRT_fail(ctx, "%s: None backend cannot be added",
VRT_BACKEND_string(vd->dir));
return;
}
@@ -160,7 +160,7 @@ vdir_remove_backend(VRT_CTX, struct vdir *vd, VCL_BACKEND be, unsigned *cur)
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
CHECK_OBJ_NOTNULL(vd, VDIR_MAGIC);
if (be == NULL) {
- VRT_fail(ctx, "%s: NULL backend cannot be removed",
+ VRT_fail(ctx, "%s: None backend cannot be removed",
VRT_BACKEND_string(vd->dir));
return;
}
diff --git a/vmod/vmod_directors_shard.c b/vmod/vmod_directors_shard.c
index 242723684..19f48339b 100644
--- a/vmod/vmod_directors_shard.c
+++ b/vmod/vmod_directors_shard.c
@@ -319,7 +319,7 @@ vmod_shard_add_backend(VRT_CTX, struct vmod_directors_shard *vshard,
if (args->backend == NULL) {
shard_fail(ctx, vshard->shardd->name, "%s",
- "NULL backend cannot be added");
+ "None backend cannot be added");
return (0);
}
More information about the varnish-commit
mailing list