projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
20613: Update unconfigured logger check to accommodate NullHandler
[arvados.git]
/
sdk
/
python
/
arvados
/
__init__.py
diff --git
a/sdk/python/arvados/__init__.py
b/sdk/python/arvados/__init__.py
index 06a4f07a798e274094160dc9ce836ca6507b4b4d..39fdb110031e12a76b6dc4cbcfcf0c6f1fe21df7 100644
(file)
--- a/
sdk/python/arvados/__init__.py
+++ b/
sdk/python/arvados/__init__.py
@@
-13,14
+13,12
@@
import hashlib
import http.client
import httplib2
import json
import http.client
import httplib2
import json
-import logging
+import logging
as stdliblog
import os
import pprint
import re
import string
import os
import pprint
import re
import string
-import subprocess
import sys
import sys
-import threading
import time
import types
import zlib
import time
import types
import zlib
@@
-35,20
+33,21
@@
from .collection import CollectionReader, CollectionWriter, ResumableCollectionW
from arvados.keep import *
from arvados.stream import *
from .arvfile import StreamFileReader
from arvados.keep import *
from arvados.stream import *
from .arvfile import StreamFileReader
+from .logging import log_format, log_date_format, log_handler
from .retry import RetryLoop
import arvados.errors as errors
import arvados.util as util
from .retry import RetryLoop
import arvados.errors as errors
import arvados.util as util
+# Override logging module pulled in via `from ... import *`
+# so users can `import arvados.logging`.
+logging = sys.modules['arvados.logging']
+
# Set up Arvados logging based on the user's configuration.
# All Arvados code should log under the arvados hierarchy.
# Set up Arvados logging based on the user's configuration.
# All Arvados code should log under the arvados hierarchy.
-log_handler = logging.StreamHandler()
-log_handler.setFormatter(logging.Formatter(
- '%(asctime)s %(name)s[%(process)d] %(levelname)s: %(message)s',
- '%Y-%m-%d %H:%M:%S'))
-logger = logging.getLogger('arvados')
+logger = stdliblog.getLogger('arvados')
logger.addHandler(log_handler)
logger.addHandler(log_handler)
-logger.setLevel(
loggin
g.DEBUG if config.get('ARVADOS_DEBUG')
- else
loggin
g.WARNING)
+logger.setLevel(
stdliblo
g.DEBUG if config.get('ARVADOS_DEBUG')
+ else
stdliblo
g.WARNING)
def task_set_output(self, s, num_retries=5):
for tries_left in RetryLoop(num_retries=num_retries, backoff_start=0):
def task_set_output(self, s, num_retries=5):
for tries_left in RetryLoop(num_retries=num_retries, backoff_start=0):