tool
/
atlas
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ATLAS-4657: Python client updated to not set root logging settings 

Signed-off-by: Madhan Neethiraj <madhan@apache.org>
This commit is contained in:
Maxim Martynov 2022-01-17 23:02:22 +03:00 committed by Madhan Neethiraj
parent 2989e4c265
commit 98900e3492
2 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
intg/src/main/python/apache_atlas/__init__.py
View File

@ -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()

26
intg/src/main/python/apache_atlas/client/base_client.py
View File

@ -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: