Skip to content

IGNITE-18788 Fix firing query events only if debug level logger enabled. #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivandasch merged 1 commit into from
Feb 14, 2023
Merged

IGNITE-18788 Fix firing query events only if debug level logger enabled. #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/pr_check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v4.3.0
with:
python-version: ${{ matrix.cfg.python}}
- name: Install Apache Ignite
Expand All @@ -54,7 +54,7 @@ jobs:

- name: Install tox
run: |
pip install tox
pip install tox==3.28.0

- name: Run tests
run: |
Expand Down
29 changes: 15 additions & 14 deletions pyignite/queries/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,26 +247,27 @@ def _on_query_started(self, conn):
self.op_code, _get_op_code_name(self.op_code))

def _on_query_finished(self, conn, result=None, err=None):
if logger.isEnabledFor(logging.DEBUG):
dur_ms = _sec_to_millis(time.monotonic() - self._start_ts)
if result and result.status != 0:
err = result.message
if err:
dur_ms = _sec_to_millis(time.monotonic() - self._start_ts)
if result and result.status != 0:
err = result.message
if err:
if logger.isEnabledFor(logging.DEBUG):
logger.debug("Failed to perform query(query_id=%d, op_type=%s, host=%s, port=%d, node_id=%s) "
"in %d ms: %s", self.query_id, _get_op_code_name(self.op_code),
conn.host, conn.port, conn.uuid, dur_ms, err)
if self._enabled_query_listener(conn):
self._event_listener(conn).publish_query_fail(conn.host, conn.port, conn.uuid, self.query_id,
self.op_code, _get_op_code_name(self.op_code),
dur_ms, err)
else:
if self._enabled_query_listener(conn):
self._event_listener(conn).publish_query_fail(conn.host, conn.port, conn.uuid, self.query_id,
self.op_code, _get_op_code_name(self.op_code),
dur_ms, err)
else:
if logger.isEnabledFor(logging.DEBUG):
logger.debug("Finished query(query_id=%d, op_type=%s, host=%s, port=%d, node_id=%s) "
"successfully in %d ms", self.query_id, _get_op_code_name(self.op_code),
conn.host, conn.port, conn.uuid, dur_ms)
if self._enabled_query_listener(conn):
self._event_listener(conn).publish_query_success(conn.host, conn.port, conn.uuid, self.query_id,
self.op_code, _get_op_code_name(self.op_code),
dur_ms)
if self._enabled_query_listener(conn):
self._event_listener(conn).publish_query_success(conn.host, conn.port, conn.uuid, self.query_id,
self.op_code, _get_op_code_name(self.op_code),
dur_ms)


class ConfigQuery(Query):
Expand Down
12 changes: 12 additions & 0 deletions tests/common/test_query_listener.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,18 @@ def on_query_success(self, event):
events.append(event)


@pytest.fixture(autouse=True)
def setup_logger():
from pyignite.queries.query import logger

try:
# Disable logger in order to test events with disabled debug logging.
logger.disabled = True
yield logger
finally:
logger.disabled = False


@pytest.fixture
def client():
client = Client(event_listeners=[QueryRouteListener()])
Expand Down
6 changes: 4 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@ max-line-length=120
ignore = F401,F403,F405,F821

[testenv:codestyle]
basepython = python3.8
basepython = python3.11
commands = flake8

[testenv]
passenv = TEAMCITY_VERSION IGNITE_HOME
passenv =
TEAMCITY_VERSION
IGNITE_HOME
envdir = {homedir}/.virtualenvs/pyignite-{envname}
deps =
-r ./requirements/install.txt
Expand Down