This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 436753723 ATLAS-4657: Python client updated to not set root logging
settings
436753723 is described below
commit 436753723e9419ed0c5d45db1908333def89b707
Author: Maxim Martynov <martinov_m...@mail.ru>
AuthorDate: Mon Jan 17 23:02:22 2022 +0300
ATLAS-4657: Python client updated to not set root logging settings
Signed-off-by: Madhan Neethiraj <mad...@apache.org>
(cherry picked from commit 98900e3492c19d59c5cecbf8a440ae9f01578b31)
---
intg/src/main/python/apache_atlas/__init__.py | 22 ------------------
.../main/python/apache_atlas/client/base_client.py | 26 ++++++++++------------
2 files changed, 12 insertions(+), 36 deletions(-)
diff --git a/intg/src/main/python/apache_atlas/__init__.py
b/intg/src/main/python/apache_atlas/__init__.py
index 0c9069a63..d9984f11e 100644
--- a/intg/src/main/python/apache_atlas/__init__.py
+++ b/intg/src/main/python/apache_atlas/__init__.py
@@ -15,25 +15,3 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-import logging
-from logging.config import dictConfig
-
-logging_config = dict(
- version=1,
- formatters={
- 'f': {'format': '%(asctime)s %(name)-12s %(levelname)-8s %(message)s'}
- },
- handlers={
- 'h': {'class': 'logging.StreamHandler',
- 'formatter': 'f',
- 'level': logging.DEBUG}
- },
- root={
- 'handlers': ['h'],
- 'level': logging.INFO,
- },
-)
-
-dictConfig(logging_config)
-
-logger = logging.getLogger()
diff --git a/intg/src/main/python/apache_atlas/client/base_client.py
b/intg/src/main/python/apache_atlas/client/base_client.py
index bd52660e3..b2c181ae7 100644
--- a/intg/src/main/python/apache_atlas/client/base_client.py
+++ b/intg/src/main/python/apache_atlas/client/base_client.py
@@ -34,7 +34,7 @@ from apache_atlas.utils import HTTPMethod
from apache_atlas.utils import HTTPStatus
from apache_atlas.utils import type_coerce
-LOG = logging.getLogger('apache_atlas')
+log = logging.getLogger('apache_atlas')
class AtlasClient:
@@ -68,11 +68,11 @@ class AtlasClient:
if request_obj is not None:
params['data'] = json.dumps(request_obj)
- if LOG.isEnabledFor(logging.DEBUG):
- LOG.debug("------------------------------------------------------")
- LOG.debug("Call : %s %s", api.method, path)
- LOG.debug("Content-type : %s", api.consumes)
- LOG.debug("Accept : %s", api.produces)
+ if log.isEnabledFor(logging.DEBUG):
+ log.debug("------------------------------------------------------")
+ log.debug("Call : %s %s", api.method, path)
+ log.debug("Content-type : %s", api.consumes)
+ log.debug("Accept : %s", api.produces)
response = None
@@ -86,7 +86,7 @@ class AtlasClient:
response = self.session.delete(path, **params)
if response is not None:
- LOG.debug("HTTP Status: %s", response.status_code)
+ log.debug("HTTP Status: %s", response.status_code)
if response is None:
return None
@@ -96,10 +96,10 @@ class AtlasClient:
try:
if response.content is not None:
- if LOG.isEnabledFor(logging.DEBUG):
- LOG.debug("<== __call_api(%s,%s,%s), result = %s",
vars(api), params, request_obj, response)
+ if log.isEnabledFor(logging.DEBUG):
+ log.debug("<== __call_api(%s,%s,%s), result = %s",
vars(api), params, request_obj, response)
- LOG.debug(response.json())
+ log.debug(response.json())
if response_type == str:
return json.dumps(response.json())
@@ -107,13 +107,11 @@ class AtlasClient:
else:
return None
except Exception as e:
- print(e)
-
- LOG.exception("Exception occurred while parsing response with
msg: %s", e)
+ log.exception("Exception occurred while parsing response with
msg: %s", e)
raise AtlasServiceException(api, response)
elif response.status_code == HTTPStatus.SERVICE_UNAVAILABLE:
- LOG.error("Atlas Service unavailable. HTTP Status: %s",
HTTPStatus.SERVICE_UNAVAILABLE)
+ log.error("Atlas Service unavailable. HTTP Status: %s",
HTTPStatus.SERVICE_UNAVAILABLE)
return None
else:
