openstack/deb-python-taskflow
Code Issues Proposed changes

Merge "Adjust logging levels and usage to follow standards"

Browse Source
This commit is contained in:
Jenkins
2014-03-22 03:27:58 +00:00
committed by Gerrit Code Review
parent 3ba3ed3312 2d197a3bd8
commit 563bede006
8 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
taskflow/jobs/backends/impl_zookeeper.py
View File

@@ -222,19 +222,20 @@ class ZookeeperJobBoard(jobboard.JobBoard):
details=job_data.get("details", {}))
self._known_jobs[path] = (job, _READY)
except (ValueError, TypeError, KeyError):
LOG.exception("Incorrectly formatted job data found"
" at path: %s", path)
LOG.warn("Incorrectly formatted job data found at path: %s",
path, exc_info=True)
except self._client.handler.timeout_exception:
LOG.warn("Connection timed out fetching job data"
" from path: %s", path)
LOG.warn("Connection timed out fetching job data from path: %s",
path, exc_info=True)
except k_exceptions.SessionExpiredError:
LOG.warn("Session expired fetching job data from path: %s", path)
LOG.warn("Session expired fetching job data from path: %s", path,
exc_info=True)
except k_exceptions.NoNodeError:
LOG.warn("No job node found at path: %s, it must have"
" disappeared or was removed", path)
LOG.debug("No job node found at path: %s, it must have"
" disappeared or was removed", path)
except k_exceptions.KazooException:
LOG.exception("Internal error fetching job data from"
" path: %s", path)
LOG.warn("Internal error fetching job data from path: %s",
path, exc_info=True)
def _on_job_posting(self, children):
LOG.debug("Got children %s under path %s", children, self.path)

4
taskflow/listeners/base.py
View File

@@ -106,8 +106,8 @@ class ListenerBase(object):
self.deregister()
except Exception:
# Don't let deregistering throw exceptions
LOG.exception("Failed deregistering listeners from engine %s",
self._engine)
LOG.warn("Failed deregistering listeners from engine %s",
self._engine, exc_info=True)
@six.add_metaclass(abc.ABCMeta)

4
taskflow/listeners/timing.py
View File

@@ -50,8 +50,8 @@ class TimingListener(base.ListenerBase):
# Don't let storage failures throw exceptions in a listener method.
self._engine.storage.update_task_metadata(task_name, meta_update)
except excp.StorageError:
LOG.exception("Failure to store duration update %s for task %s",
meta_update, task_name)
LOG.warn("Failure to store duration update %s for task %s",
meta_update, task_name, exc_info=True)
def _task_receiver(self, state, details):
task_name = details['task_name']

4
taskflow/persistence/backends/impl_sqlalchemy.py
View File

@@ -142,10 +142,10 @@ def _ping_listener(dbapi_conn, connection_rec, connection_proxy):
dbapi_conn.cursor().execute('select 1')
except dbapi_conn.OperationalError as ex:
if _in_any(six.text_type(ex.args[0]), MY_SQL_GONE_WAY_AWAY_ERRORS):
LOG.warn('Got mysql server has gone away: %s', ex)
LOG.warn('Got mysql server has gone away', exc_info=True)
raise sa_exc.DisconnectionError("Database server went away")
elif _in_any(six.text_type(ex.args[0]), POSTGRES_GONE_WAY_AWAY_ERRORS):
LOG.warn('Got postgres server has gone away: %s', ex)
LOG.warn('Got postgres server has gone away', exc_info=True)
raise sa_exc.DisconnectionError("Database server went away")
else:
raise

11
taskflow/task.py
View File

@@ -95,8 +95,9 @@ class BaseTask(atom.Atom):
try:
handler(self, event_data, *args, **kwargs)
except Exception:
LOG.exception("Failed calling `%s` on event '%s'",
reflection.get_callable_name(handler), event)
LOG.warn("Failed calling `%s` on event '%s'",
reflection.get_callable_name(handler), event,
exc_info=True)
@contextlib.contextmanager
def autobind(self, event_name, handler_func, **kwargs):
@@ -109,9 +110,9 @@ class BaseTask(atom.Atom):
self.bind(event_name, handler_func, **kwargs)
bound = True
except ValueError:
LOG.exception("Failed binding functor `%s` as a receiver of"
" event '%s' notifications emitted from task %s",
handler_func, event_name, self)
LOG.warn("Failed binding functor `%s` as a receiver of"
" event '%s' notifications emitted from task %s",
handler_func, event_name, self, exc_info=True)
try:
yield self
finally:

16
taskflow/tests/unit/test_task.py
View File

@@ -225,27 +225,27 @@ class TaskTest(test.TestCase):
self.assertEqual(result, [1.0, 1.0, 1.0])
self.assertEqual(mocked_warn.call_count, 2)
@mock.patch.object(task.LOG, 'exception')
def test_update_progress_handler_failure(self, mocked_exception):
@mock.patch.object(task.LOG, 'warn')
def test_update_progress_handler_failure(self, mocked_warn):
def progress_callback(*args, **kwargs):
raise Exception('Woot!')
task = ProgressTask()
with task.autobind('update_progress', progress_callback):
task.execute([0.5])
mocked_exception.assert_called_once_with(
mocked_warn.assert_called_once_with(
mock.ANY, reflection.get_callable_name(progress_callback),
'update_progress')
'update_progress', exc_info=mock.ANY)
@mock.patch.object(task.LOG, 'exception')
def test_autobind_non_existent_event(self, mocked_exception):
@mock.patch.object(task.LOG, 'warn')
def test_autobind_non_existent_event(self, mocked_warn):
event = 'test-event'
handler = lambda: None
task = MyTask()
with task.autobind(event, handler):
self.assertEqual(len(task._events_listeners), 0)
mocked_exception.assert_called_once_with(
mock.ANY, handler, event, task)
mocked_warn.assert_called_once_with(
mock.ANY, handler, event, task, exc_info=mock.ANY)
def test_autobind_handler_is_none(self):
task = MyTask()

2
taskflow/utils/lock_utils.py
View File

@@ -331,7 +331,7 @@ class _InterProcessLock(object):
if not os.path.exists(basedir):
misc.ensure_tree(basedir)
LOG.info('Created lock path: %s', basedir)
LOG.debug('Created lock path: %s', basedir)
self.lockfile = open(self.fname, 'w')

4
taskflow/utils/misc.py
View File

@@ -395,8 +395,8 @@ class TransitionNotifier(object):
try:
callback(state, *args, **kwargs)
except Exception:
LOG.exception(("Failure calling callback %s to notify about"
" state transition %s"), callback, state)
LOG.warn("Failure calling callback %s to notify about state"
" transition %s", callback, state, exc_info=True)
def register(self, state, callback, args=None, kwargs=None):
assert six.callable(callback), "Callback must be callable"