commit b55b703ea065f783c6045a024fda48d9f1902ab8
author Chris McDonald <cjmcdonald@chromium.org> Thu Jun 17 16:41:32 2021 -0600
committer Commit Bot <commit-bot@chromium.org> Fri Jul 16 23:53:37 2021 +0000
tree 0460088cc95ef64cf29472c5156679b269286471
parent d4bdef217e97b8233ef8c56a647c36e1efdf6a8d

cbuildbot: Move Buildbot printing functions to `cbuildbot_alerts` module

Move all of the cbuildbot-specific printing routines out of cros_logging
and in to a new submodule of cbuildbot. Fix up all usages of these
functions to point to the new location.

BUG=b:191490453
TEST=`run_tests`

Change-Id: I5f5f28256b89d2b0500c1c404e2718f33aceaa31
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2973409
Tested-by: Chris McDonald <cjmcdonald@chromium.org>
Commit-Queue: Chris McDonald <cjmcdonald@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

scripts/upload_symbols.py

diff --git a/scripts/upload_symbols.py b/scripts/upload_symbols.py
index a00006b..2d94fc6 100644
--- a/scripts/upload_symbols.py
+++ b/scripts/upload_symbols.py
@@ -12,6 +12,7 @@
 import http.client
 import itertools
 import json
+import logging
 import os
 import socket
 import sys
@@ -20,17 +21,18 @@
 import time
 import urllib.parse
 
+from chromite.third_party import requests
+
+from chromite.cbuildbot import cbuildbot_alerts
 from chromite.lib import cache
 from chromite.lib import commandline
 from chromite.lib import constants
 from chromite.lib import cros_build_lib
-from chromite.lib import cros_logging as logging
 from chromite.lib import gs
 from chromite.lib import osutils
 from chromite.lib import path_util
 from chromite.lib import retry_stats
 from chromite.scripts import cros_generate_breakpad_symbols
-from chromite.third_party import requests
 
 
 # Needs to be after chromite imports.
@@ -273,7 +275,7 @@
   # Hopefully the crash server will let it through.  But it probably won't.
   # Not sure what the best answer is in this case.
   if file_size >= CRASH_SERVER_FILE_LIMIT:
-    logging.PrintBuildbotStepWarnings()
+    cbuildbot_alerts.PrintBuildbotStepWarnings()
     logging.warning('upload file %s is awfully large, risking rejection by '
                     'the symbol server (%s > %s)', symbol.display_path,
                     file_size, CRASH_SERVER_FILE_LIMIT)
@@ -499,12 +501,12 @@
                result_counts)
 
   if result_counts[SymbolFile.ERROR]:
-    logging.PrintBuildbotStepWarnings()
+    cbuildbot_alerts.PrintBuildbotStepWarnings()
     logging.warning('%d non-recoverable upload errors',
                     result_counts[SymbolFile.ERROR])
 
   if result_counts[SymbolFile.INITIAL]:
-    logging.PrintBuildbotStepWarnings()
+    cbuildbot_alerts.PrintBuildbotStepWarnings()
     logging.warning('%d upload(s) were skipped because of excessive errors',
                     result_counts[SymbolFile.INITIAL])