launchpad-reviewers team mailing list archive

[Guruprasad <mp+446758@xxxxxxxxxxxxxxxxxx>]

Guruprasad has proposed merging ~lgp171188/launchpad:tweak-debbugs-sync-script into launchpad:master.

Commit message:
Make the destination directory configurable in the debbugs-sync script

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~lgp171188/launchpad/+git/launchpad/+merge/446758
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad:tweak-debbugs-sync-script into launchpad:master.

diff --git a/charm/launchpad-scripts/templates/crontab.j2 b/charm/launchpad-scripts/templates/crontab.j2
index d0c0072..cdcc68e 100644
--- a/charm/launchpad-scripts/templates/crontab.j2
+++ b/charm/launchpad-scripts/templates/crontab.j2
@@ -31,7 +31,7 @@ LPCONFIG=launchpad-scripts
 27 07 * * 3 {{ code_dir }}/cronscripts/rosetta-pofile-stats.py -q --log-file=INFO:{{ logs_dir }}/rosetta-pofile-stats.log
 
 # Debian bugs mirroring, used by checkwatches
-4,19,34,49 * * * * {{ code_dir }}/scripts/debbugs-sync >>{{ logs_dir }}/debbugs-sync.log 2>&1
+4,19,34,49 * * * * {{ code_dir }}/scripts/debbugs-sync {{ base_dir }}/debbugs_db >> {{ logs_dir }}/debbugs-sync.log 2>&1
 
 # NB. checkwatches requires access to /srv/bugs-mirror.debian.org/
 # Reverted to doing ten at a time (--jobs=10) as https://bugs.launchpad.net/bugs/435952 should be fixed
diff --git a/charm/launchpad-scripts/templates/launchpad-scripts-lazr.conf.j2 b/charm/launchpad-scripts/templates/launchpad-scripts-lazr.conf.j2
index b05aae7..392c97a 100644
--- a/charm/launchpad-scripts/templates/launchpad-scripts-lazr.conf.j2
+++ b/charm/launchpad-scripts/templates/launchpad-scripts-lazr.conf.j2
@@ -22,6 +22,9 @@ dbuser: {{ db_session_user }}
 [librarianlogparser]
 logs_root: {{ librarian_logs_dir }}/for_parsing
 
+[malone]
+debbugs_db_location: {{ base_dir }}/debbugs_db
+
 [memcache]
 servers: {{ memcache_servers }}
 
diff --git a/scripts/debbugs-sync b/scripts/debbugs-sync
index 66be6bb..0f53905 100755
--- a/scripts/debbugs-sync
+++ b/scripts/debbugs-sync
@@ -5,7 +5,7 @@
 
 set -e
 
-TO=/srv/bugs-mirror.debian.org
+TO=${1:-/srv/bugs-mirror.debian.org}
 FROM=bugs-mirror.debian.org
 
 umask 002