[ckan-changes] [ckan/ckan] 9d4665: [#2013] Fix for paster serve restart bug

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 9d46651efa99006d4c59fc1d32887d6851e6d923
      https://github.com/ckan/ckan/commit/9d46651efa99006d4c59fc1d32887d6851e6d923
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  [#2013] Fix for paster serve restart bug

paster's restart-monitor gets a list of files by iterating over sys.modules,
which appears to include Toolkit. It calls __file__ and that causes the exception.
However paster catches an AttributeError fine and continues, whereas a plain
Exception causes the whole restart-monitor thread to crash. AttributeError also
makes more sense for a failed class attribute access.


  Commit: dc164f25a4dbc5ebcc89567491557c16e65ddbea
      https://github.com/ckan/ckan/commit/dc164f25a4dbc5ebcc89567491557c16e65ddbea
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  Merge pull request #2014 from ckan/2013-restart

[#2013] Fix for paster serve restart bug


Compare: https://github.com/ckan/ckan/compare/3c365f60d8a4...dc164f25a4db