Erik Zachte has submitted this change and it was merged.

Change subject: Make daily dammit compact script rsync files if monthly step 
fails
......................................................................


Make daily dammit compact script rsync files if monthly step fails

Change-Id: Ia4cb3390ca2c70644017d31c2584a2704998ab5c
---
M dammit.lt/bash/dammit_compact_daily.sh
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Erik Zachte: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/dammit.lt/bash/dammit_compact_daily.sh 
b/dammit.lt/bash/dammit_compact_daily.sh
index 05e1e1c..3f731ad 100755
--- a/dammit.lt/bash/dammit_compact_daily.sh
+++ b/dammit.lt/bash/dammit_compact_daily.sh
@@ -39,7 +39,8 @@
 cmd="nice perl DammitCompactHourlyOrDailyPageCountFiles.pl $mode -a $maxage -i 
$input -o $output -t $temp | tee -a $logfile | cat"
 flock -n -e $bash/dammit_compact_daily.semaphore -c "$cmd" || { echo "Script 
is already running: lock on ../bash/dammit_compact_daily.semaphore" ; exit 1 ; 
} >&2
 
-"$bash"/dammit_compact_monthly.sh || exit 1
+"$bash"/dammit_compact_monthly.sh # If dammit_compact_monthly.sh fails, we
+# continue nonetheless, to get new daily files rsynced
 
 echo_ "Publish new files\n"
 rsync -arv --include=*.bz2 $output/* $dataset1001  | tee -a $logfile | cat

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4cb3390ca2c70644017d31c2584a2704998ab5c
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikistats
Gerrit-Branch: master
Gerrit-Owner: QChris <[email protected]>
Gerrit-Reviewer: Erik Zachte <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to