← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~danilo/launchpad/bug-680908 into lp:launchpad

 

Данило Шеган has proposed merging lp:~danilo/launchpad/bug-680908 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #680908 Script translations-export-to-branch needs its own config section
  https://bugs.launchpad.net/bugs/680908

For more details, see:
https://code.launchpad.net/~danilo/launchpad/bug-680908/+merge/44599

= Bug 680908 =

Pass in a config section to the OOPS handler so we can set oops_prefix and error_dir for production.

Production config changes follow-up branch in lp:~danilo/lp-production-configs/bug-680908

-- 
https://code.launchpad.net/~danilo/launchpad/bug-680908/+merge/44599
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~danilo/launchpad/bug-680908 into lp:launchpad.
=== modified file 'configs/development/launchpad-lazr.conf'
--- configs/development/launchpad-lazr.conf	2010-11-18 04:09:19 +0000
+++ configs/development/launchpad-lazr.conf	2010-12-23 17:22:04 +0000
@@ -275,6 +275,10 @@
 error_dir: /var/tmp/codehosting.test
 oops_prefix: USMP
 
+[translations_export_to_branch]
+error_dir: /var/tmp/translations_export_to_branch
+oops_prefix: TEB
+
 [upgrade_branches]
 oops_prefix: UBJD
 error_dir: /var/tmp/codehosting.test

=== modified file 'cronscripts/translations-export-to-branch.py'
--- cronscripts/translations-export-to-branch.py	2010-04-27 19:48:39 +0000
+++ cronscripts/translations-export-to-branch.py	2010-12-23 17:22:04 +0000
@@ -25,4 +25,5 @@
 if __name__ == '__main__':
     script = ExportTranslationsToBranch(
         'translations-export-to-branch', dbuser='translationstobranch')
+    script.config_name = 'translations_export_to_branch'
     script.lock_and_run()

=== modified file 'lib/canonical/config/schema-lazr.conf'
--- lib/canonical/config/schema-lazr.conf	2010-11-18 04:09:19 +0000
+++ lib/canonical/config/schema-lazr.conf	2010-12-23 17:22:04 +0000
@@ -1781,6 +1781,16 @@
 # See [error_reports].
 copy_to_zlog: false
 
+[translations_export_to_branch]
+# See [error_reports].
+error_dir: none
+
+# See [error_reports].
+oops_prefix: none
+
+# See [error_reports].
+copy_to_zlog: false
+
 
 [sendbranchmail]
 # The database user which will be used by this process.

=== modified file 'lib/lp/translations/scripts/translations_to_branch.py'
--- lib/lp/translations/scripts/translations_to_branch.py	2010-11-23 03:04:12 +0000
+++ lib/lp/translations/scripts/translations_to_branch.py	2010-12-23 17:22:04 +0000
@@ -307,10 +307,12 @@
         from lp.registry.model.product import Product
         from lp.registry.model.productseries import ProductSeries
 
+        from canonical.launchpad.webapp import errorlog
+        errorlog.globalErrorUtility.configure(self.config_name)
         if self.options.no_fudge:
             self.fudge_factor = timedelta(0)
 
-        self.logger.info("Exporting to translations branches.")
+        self.logger.error("Exporting to translations branches.")
 
         self.store = getUtility(IStoreSelector).get(MAIN_STORE, SLAVE_FLAVOR)