projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19818: Deprecate arvados.api.OrderedJsonModel
[arvados.git]
/
sdk
/
cwl
/
arvados_cwl
/
__init__.py
diff --git
a/sdk/cwl/arvados_cwl/__init__.py
b/sdk/cwl/arvados_cwl/__init__.py
index 6a8e320c6d36edf60e5a6a59992f528809054240..7968fb1e2b2900452e2535e30dad39e285ae83c4 100644
(file)
--- a/
sdk/cwl/arvados_cwl/__init__.py
+++ b/
sdk/cwl/arvados_cwl/__init__.py
@@
-28,10
+28,10
@@
from cwltool.utils import adjustFileObjs, adjustDirObjs, get_listing
import arvados
import arvados.config
import arvados
import arvados.config
+import arvados.logging
from arvados.keep import KeepClient
from arvados.errors import ApiError
import arvados.commands._util as arv_cmd
from arvados.keep import KeepClient
from arvados.errors import ApiError
import arvados.commands._util as arv_cmd
-from arvados.api import OrderedJsonModel
from .perf import Perf
from ._version import __version__
from .perf import Perf
from ._version import __version__
@@
-337,7
+337,6
@@
def main(args=sys.argv[1:],
if api_client is None:
api_client = arvados.safeapi.ThreadSafeApiCache(
api_params={
if api_client is None:
api_client = arvados.safeapi.ThreadSafeApiCache(
api_params={
- 'model': OrderedJsonModel(),
'num_retries': arvargs.retries,
'timeout': arvargs.http_timeout,
},
'num_retries': arvargs.retries,
'timeout': arvargs.http_timeout,
},
@@
-377,9
+376,11
@@
def main(args=sys.argv[1:],
logger.setLevel(logging.INFO)
logging.getLogger('arvados').setLevel(logging.INFO)
logging.getLogger('arvados.keep').setLevel(logging.WARNING)
logger.setLevel(logging.INFO)
logging.getLogger('arvados').setLevel(logging.INFO)
logging.getLogger('arvados.keep').setLevel(logging.WARNING)
- # API retries are
at WARNING
level and can be noisy, but as long as
+ # API retries are
filtered to the INFO
level and can be noisy, but as long as
# they succeed we don't need to see warnings about it.
# they succeed we don't need to see warnings about it.
- logging.getLogger('googleapiclient').setLevel(logging.ERROR)
+ googleapiclient_http_logger = logging.getLogger('googleapiclient.http')
+ googleapiclient_http_logger.addFilter(arvados.logging.GoogleHTTPClientFilter())
+ googleapiclient_http_logger.setLevel(logging.WARNING)
if arvargs.debug:
logger.setLevel(logging.DEBUG)
if arvargs.debug:
logger.setLevel(logging.DEBUG)
@@
-387,7
+388,8
@@
def main(args=sys.argv[1:],
# In debug mode show logs about retries, but we arn't
# debugging the google client so we don't need to see
# everything.
# In debug mode show logs about retries, but we arn't
# debugging the google client so we don't need to see
# everything.
- logging.getLogger('googleapiclient').setLevel(logging.WARNING)
+ googleapiclient_http_logger.setLevel(logging.NOTSET)
+ logging.getLogger('googleapiclient').setLevel(logging.INFO)
if arvargs.quiet:
logger.setLevel(logging.WARN)
if arvargs.quiet:
logger.setLevel(logging.WARN)