Ori.livneh has submitted this change and it was merged.

Change subject: coal: fix archive def and file path
......................................................................


coal: fix archive def and file path

Change-Id: Id9d44a9eafb303b4e01aa364937ad42981d7f1e6
---
M modules/webperf/files/coal
M modules/webperf/templates/coal.conf.erb
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/modules/webperf/files/coal b/modules/webperf/files/coal
index 38f9fd1..71d73d1 100755
--- a/modules/webperf/files/coal
+++ b/modules/webperf/files/coal
@@ -47,6 +47,7 @@
     'domComplete',    # Time to DOM Comlete event
     'loadEventEnd',   # Time to load event completion
 )
+ARCHIVES = [(UPDATE_INTERVAL, RETENTION)]
 
 
 def median(population):
@@ -93,10 +94,9 @@
         return os.path.join(self.args.whisper_dir, metric + '.wsp')
 
     def create_whisper_files(self):
-        archives = [(WINDOW_SPAN, UPDATE_INTERVAL)]
         for metric in METRICS:
             try:
-                whisper.create(self.get_whisper_file(metric), archives)
+                whisper.create(self.get_whisper_file(metric), ARCHIVES)
             except whisper.InvalidConfiguration as e:
                 pass  # Already exists.
 
diff --git a/modules/webperf/templates/coal.conf.erb 
b/modules/webperf/templates/coal.conf.erb
index 9bbeeb9..0902704 100644
--- a/modules/webperf/templates/coal.conf.erb
+++ b/modules/webperf/templates/coal.conf.erb
@@ -10,4 +10,4 @@
 respawn
 respawn limit unlimited
 
-exec /srv/webperf/coal --whisper-dir "/var/lib/coal" "<%= @endpoint %>"
+exec /usr/local/bin/coal --whisper-dir "/var/lib/coal" "<%= @endpoint %>"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9d44a9eafb303b4e01aa364937ad42981d7f1e6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to