Ottomata has submitted this change and it was merged.
Change subject: Separate rsync from generate cron job
......................................................................
Separate rsync from generate cron job
This will allow everything in limn-public-data to be synced in a single cron
job,
rather than in a cron job per ::generate()
Change-Id: I86c7a7de2af96e888e50e66b77284e726ce41377
---
M manifests/misc/statistics.pp
1 file changed, 10 insertions(+), 6 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index 5c24d1c..ba10db7 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -768,6 +768,13 @@
group => wikidev,
mode => '0775',
}
+
+ # Rsync anything generated in $public_dir to $rsync_to
+ cron { "rsync_limn_public_data":
+ command => "/usr/bin/rsync -rt ${public_dir}/* ${rsync_to}",
+ user => $user,
+ minute => 15,
+ }
}
@@ -804,10 +811,6 @@
# log file for the generate cron job
$log =
"${misc::statistics::limn::data::log_dir}/limn-${title}-data.log"
- # Rsync from $public_dir/${title}
- $rsync_from = "${misc::statistics::limn::data::public_dir}/${title}"
- $rsync_to = $misc::statistics::limn::data::rsync_to
-
# I'm not totally sure what this is...
$output = "${rsync_from}/datafiles"
@@ -828,8 +831,9 @@
mode => '0775',
}
- cron { "rsync_${title}_apps_stats":
- command => "python ${command} ${config_dir} >> ${log} 2>&1 &&
/usr/bin/rsync -rt ${rsync_from} ${rsync_to}",
+ # This will generate data into $public_dir/${title} (if configured
correctly)
+ cron { "generate_${title}_limn_public_data":
+ command => "python ${command} ${config_dir} >> ${log}",
user => $user,
minute => 0,
}
--
To view, visit https://gerrit.wikimedia.org/r/171572
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I86c7a7de2af96e888e50e66b77284e726ce41377
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
