← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~stevenk/launchpad/garbo-abort-info into lp:launchpad

 

Steve Kowalik has proposed merging lp:~stevenk/launchpad/garbo-abort-info into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #888049 in Launchpad itself: "garbo-frequently logged an oops"
  https://bugs.launchpad.net/launchpad/+bug/888049

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/garbo-abort-info/+merge/154592

Drop the warnings about script and looptuner abortion from WARNING to INFO. This also means they will stop creating OOPSes for every one. The default logger used by tests does not log INFO, so those got dropped from the test.
-- 
https://code.launchpad.net/~stevenk/launchpad/garbo-abort-info/+merge/154592
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/garbo-abort-info into lp:launchpad.
=== modified file 'lib/lp/scripts/garbo.py'
--- lib/lp/scripts/garbo.py	2013-02-04 03:54:16 +0000
+++ lib/lp/scripts/garbo.py	2013-03-21 05:25:26 +0000
@@ -1408,9 +1408,8 @@
             else:
                 break
 
-        # If the script ran out of time, warn.
         if self.get_remaining_script_time() < 0:
-            self.logger.warn(
+            self.logger.info(
                 "Script aborted after %d seconds.", self.script_timeout)
 
         if tunable_loops:

=== modified file 'lib/lp/services/doc/looptuner.txt'
--- lib/lp/services/doc/looptuner.txt	2011-12-21 14:29:37 +0000
+++ lib/lp/services/doc/looptuner.txt	2013-03-21 05:25:26 +0000
@@ -446,7 +446,7 @@
 == Abort Timeout ==
 
 LoopTuner allows a timeout to be specified. If the loop runs for longer
-than this timeout, it is aborted and a WARNING logged.
+than this timeout, it is aborted and a INFO logged.
 
     >>> body = PlannedLoop([5, 7, 8, 9, 10, 11, 9, 20, 7, 10, 10])
     >>> loop = TestTuner(body, goal_seconds, 100, abort_time=20)
@@ -454,15 +454,13 @@
     start
     same (0.0)
     same (0.0)
-    WARNING:...:Task aborted after 20 seconds.
 
 
 == Cleanup ==
 
-    Loops can define a clean up hook to clean up opened resources.
-    We need this because loops can be aborted mid run, so we cannot rely
-    on clean up code in the isDone() method, and __del__ is fragile and
-    can never be relied on.
+Loops can define a clean up hook to clean up opened resources. We need this
+because loops can be aborted mid run, so we cannot rely on clean up code in
+the isDone() method, and __del__ is fragile and can never be relied on.
 
     >>> class PlannedLoopWithCleanup(PlannedLoop):
     ...     def cleanUp(self):
@@ -480,6 +478,5 @@
     start
     same (0.0)
     same (0.0)
-    WARNING:...:Task aborted after 20 seconds.
     clean up
 

=== modified file 'lib/lp/services/looptuner.py'
--- lib/lp/services/looptuner.py	2012-10-12 07:00:39 +0000
+++ lib/lp/services/looptuner.py	2013-03-21 05:25:26 +0000
@@ -167,7 +167,7 @@
             while not self.operation.isDone():
 
                 if self._isTimedOut():
-                    self.log.warn(
+                    self.log.info(
                         "Task aborted after %d seconds.", self.abort_time)
                     break