ArielGlenn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/375783 )
Change subject: use cleaner method of getting config settings for rdf cat dumps
cron job
......................................................................
use cleaner method of getting config settings for rdf cat dumps cron job
Change-Id: Ief490417370c6b7ce28b77e189ce5ea02290d7c0
---
M modules/snapshot/files/cron/dumpcategoriesrdf.sh
1 file changed, 26 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/375783/1
diff --git a/modules/snapshot/files/cron/dumpcategoriesrdf.sh
b/modules/snapshot/files/cron/dumpcategoriesrdf.sh
index 3153aa9..738ca5f 100755
--- a/modules/snapshot/files/cron/dumpcategoriesrdf.sh
+++ b/modules/snapshot/files/cron/dumpcategoriesrdf.sh
@@ -9,6 +9,22 @@
source /usr/local/etc/set_dump_dirs.sh
+checkval() {
+ setting=$1
+ value=$2
+ if [ -z "$value" -o "$value" == "null" ]; then
+ echo "failed to retrieve value of $setting from $configfile" >& 2
+ exit 1
+ fi
+}
+
+getsetting() {
+ results=$1
+ section=$2
+ setting=$3
+ echo "$results" | /usr/bin/jq -M -r ".$section.$setting"
+}
+
usage() {
echo "Usage: $0 --list wikis.dblist [--config <pathtofile>] [--dryrun]"
echo
@@ -52,20 +68,17 @@
exit 1
fi
-deployDir=$(egrep "^dir=" "$configFile" | mawk -Fdir= '{ print $2 }')
-gzip=$(egrep "^gzip=" "$configFile" | mawk -Fgzip= '{ print $2 }')
-privateList=$(egrep "^privatelist=" "$configFile" | mawk -Fprivatelist= '{
print $2 }')
-publicDir=$(egrep "^public=" "$configFile" | mawk -Fpublic= '{ print $2 }')
+args="wiki:dir,privatelist;tools:gzip;output:public"
+results=`python "${repodir}/getconfigvals.py" --configfile "$configfile"
--args "$args"`
-if [ -z "$deployDir" -o -z "$gzip" -o -z "$privateList" -o -z "$publicDir" ];
then
- echo "failed to find value of one of the following from config file
$configFile:"
- echo "gzip: $gzip"
- echo "dir: $deployDir"
- echo "privatelist: $privateList"
- echo "public: $publicDir"
- echo "exiting..."
- exit 1
-fi
+deployDir=`getsetting "$results" "wiki" "dir"` || exit 1
+privateList=`getsetting "$results" "wiki" "privatelist"` || exit 1
+gzip=`getsetting "$results" "tools" "gzip"` || exit 1
+publicDir=`getsetting "$results" "output" "public"` || exit 1
+
+for settingname in "deployDir" "gzip" "privateList" "publicDir"; do
+ checkval "$settingname" "${!settingname}"
+done
today=$(date +'%Y%m%d')
targetDirBase="${publicDir}/other/categoriesrdf"
--
To view, visit https://gerrit.wikimedia.org/r/375783
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief490417370c6b7ce28b77e189ce5ea02290d7c0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
