Changeset 267023 in webkit

Timestamp:

Sep 14, 2020 10:58:51 AM (4 years ago)

Author:

Jonathan Bedard

Message:

[webkitcorepy] Log autoinstall details even without a logger configured
​https://bugs.webkit.org/show_bug.cgi?id=216480

Reviewed by Dewei Zhu.

• Scripts/libraries/webkitcorepy/webkitcorepy/init.py: Bump version.
• Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:

(Package.install): Use AutoInstall.log instead of logging.
(AutoInstall):
(AutoInstall.log): Check log to see if a logger is configured, if one is not,
output the message to stderr instead.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (modified) (1 diff)
• Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py (modified) (6 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-09-14  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitcorepy] Log autoinstall details even without a logger configured
+        https://bugs.webkit.org/show_bug.cgi?id=216480
+
+        Reviewed by Dewei Zhu.
+
+        * Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Bump version.
+        * Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
+        (Package.install): Use AutoInstall.log instead of logging.
+        (AutoInstall):
+        (AutoInstall.log): Check log to see if a logger is configured, if one is not,
+        output the message to stderr instead.
+
 2020-09-14  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py

@@ -36 +36 @@
 from webkitcorepy.output_capture import LoggerCapture, OutputCapture, OutputDuplicate
 
-version = Version(0, 4, 8)
+version = Version(0, 4, 9)
 
 from webkitcorepy.autoinstall import Package, AutoInstall

trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py

@@ -22 +22 @@
 
 import json
+import logging
 import math
 import os
@@ -33 +34 @@
 import zipfile
 
+from logging import NullHandler
 from webkitcorepy import log
 from webkitcorepy.version import Version
@@ -216 +218 @@
             shutil.rmtree(self.location, ignore_errors=True)
 
-            log.warning('Downloading {}...'.format(archive))
+            AutoInstall.log('Downloading {}...'.format(archive))
             archive.download()
 
@@ -231 +233 @@
                     continue
 
-                log.warning('Installing {}...'.format(archive))
+                AutoInstall.log('Installing {}...'.format(archive))
 
                 if self.slow_install:
-                    log.warning('{} is known to be slow to install'.format(archive))
+                    AutoInstall.log('{} is known to be slow to install'.format(archive))
 
                 with open(os.devnull, 'w') as devnull:
@@ -291 +293 @@
             AutoInstall.userspace_should_own(manifest)
 
-            log.warning('Installed {}!'.format(archive))
+            AutoInstall.log('Installed {}!'.format(archive))
         except Exception:
-            log.critical('Failed to install {}!'.format(archive))
+            AutoInstall.log('Failed to install {}!'.format(archive), level=logging.CRITICAL)
             raise
 
@@ -492 +494 @@
                     yield tags.Tag(tag.interpreter, tag.abi, override)
 
+    @classmethod
+    def log(cls, message, level=logging.WARNING):
+        if not log.handlers or all([isinstance(handle, NullHandler) for handle in log.handlers]):
+            sys.stderr.write(message + '\n')
+        else:
+            log.log(level, message)
+
 
 sys.meta_path.insert(0, AutoInstall)