[MediaWiki-commits] [Gerrit] varnish{xcache, xcps, ...}: subscribe to varnishlog.py - change (operations/puppet)

[Ema (Code Review)]

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/293705

Change subject: varnish{xcache,xcps,...}: subscribe to varnishlog.py
......................................................................

varnish{xcache,xcps,...}: subscribe to varnishlog.py

Upon modification of varnishlog.py, we want to make sure that all
scripts depeding on it are restarted.

Change-Id: I0e3053a9c8c15e4414f84b24d92101819391fe02
---
M modules/varnish/files/varnishlog4.py
M modules/varnish/manifests/logging/media.pp
M modules/varnish/manifests/logging/reqstats.pp
M modules/varnish/manifests/logging/rls.pp
M modules/varnish/manifests/logging/statsd.pp
M modules/varnish/manifests/logging/xcache.pp
M modules/varnish/manifests/logging/xcps.pp
7 files changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/05/293705/1

diff --git a/modules/varnish/files/varnishlog4.py 
b/modules/varnish/files/varnishlog4.py
index 433e4d3..9bfa358 100755
--- a/modules/varnish/files/varnishlog4.py
+++ b/modules/varnish/files/varnishlog4.py
@@ -23,6 +23,7 @@
 
   By default, varnishlog will group transactions by request. A specific
   transaction grouping mode can be used to override the default.
+
   For example:
 
     varnishlog(
diff --git a/modules/varnish/manifests/logging/media.pp 
b/modules/varnish/manifests/logging/media.pp
index 6f3376e..f39e0a1 100644
--- a/modules/varnish/manifests/logging/media.pp
+++ b/modules/varnish/manifests/logging/media.pp
@@ -33,6 +33,7 @@
         strict         => false,
         template_name  => 'varnishmedia',
         require        => File['/usr/local/bin/varnishmedia'],
+        subscribe      => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
         service_params => {
             enable => true,
         },
diff --git a/modules/varnish/manifests/logging/reqstats.pp 
b/modules/varnish/manifests/logging/reqstats.pp
index d22dc6a..86ec68f 100644
--- a/modules/varnish/manifests/logging/reqstats.pp
+++ b/modules/varnish/manifests/logging/reqstats.pp
@@ -58,6 +58,7 @@
         strict         => false,
         template_name  => 'varnishreqstats',
         require        => File['/usr/local/bin/varnishreqstats'],
+        subscribe      => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
         service_params => {
             require => Service[$varnish_service_name],
             enable  => true,
diff --git a/modules/varnish/manifests/logging/rls.pp 
b/modules/varnish/manifests/logging/rls.pp
index 5c12286..6e70173 100644
--- a/modules/varnish/manifests/logging/rls.pp
+++ b/modules/varnish/manifests/logging/rls.pp
@@ -33,6 +33,7 @@
         strict         => false,
         template_name  => 'varnishrls',
         require        => File['/usr/local/bin/varnishrls'],
+        subscribe      => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
         service_params => {
             enable => true,
         },
diff --git a/modules/varnish/manifests/logging/statsd.pp 
b/modules/varnish/manifests/logging/statsd.pp
index 982ea38..98ce970 100644
--- a/modules/varnish/manifests/logging/statsd.pp
+++ b/modules/varnish/manifests/logging/statsd.pp
@@ -60,6 +60,7 @@
         strict         => false,
         template_name  => 'varnishstatsd',
         require        => File['/usr/local/bin/varnishstatsd'],
+        subscribe      => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
         service_params => {
             enable => true,
         },
diff --git a/modules/varnish/manifests/logging/xcache.pp 
b/modules/varnish/manifests/logging/xcache.pp
index eb863f8..8af3d84 100644
--- a/modules/varnish/manifests/logging/xcache.pp
+++ b/modules/varnish/manifests/logging/xcache.pp
@@ -47,6 +47,7 @@
         strict         => false,
         template_name  => 'varnishxcache',
         require        => File['/usr/local/bin/varnishxcache'],
+        subscribe      => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
         service_params => {
             require => Service['varnish-frontend'],
             enable  => true,
diff --git a/modules/varnish/manifests/logging/xcps.pp 
b/modules/varnish/manifests/logging/xcps.pp
index 4951c37..8d0e442 100644
--- a/modules/varnish/manifests/logging/xcps.pp
+++ b/modules/varnish/manifests/logging/xcps.pp
@@ -39,6 +39,7 @@
         strict         => false,
         template_name  => 'varnishxcps',
         require        => File['/usr/local/bin/varnishxcps'],
+        subscribe      => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
         service_params => {
             require => Service['varnish-frontend'],
             enable  => true,

-- 
To view, visit https://gerrit.wikimedia.org/r/293705
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e3053a9c8c15e4414f84b24d92101819391fe02
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <e...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits