Skip to content

Commit

Permalink
issue #342: forward _create_control_path() to SSH plugin.
Browse files Browse the repository at this point in the history
network_cli connection type loads the "ssh" (mitogen_ssh) plugin and
expects a private method to exist.
  • Loading branch information
dw committed Aug 19, 2018
1 parent ed19e10 commit 2e3d04b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
9 changes: 9 additions & 0 deletions ansible_mitogen/plugins/connection/mitogen_ssh.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
options:
"""

import ansible.plugins.connection.ssh

try:
import ansible_mitogen.connection
except ImportError:
Expand All @@ -54,3 +56,10 @@

class Connection(ansible_mitogen.connection.Connection):
transport = 'ssh'
vanilla_class = ansible.plugins.connection.ssh.Connection

@staticmethod
def _create_control_path(*args, **kwargs):
"""Forward _create_control_path() to the implementation in ssh.py."""
# https://github.com/dw/mitogen/issues/342
return Connection.vanilla_class._create_control_path(*args, **kwargs)
4 changes: 4 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,9 @@ Core Library
could spuriously wake up due to ignoring an error bit set on events returned
by the kernel, manifesting as a failure to read from an unrelated descriptor.

* `#342 <https://github.com/dw/mitogen/issues/342>`_: The ``network_cli``
connection type would fail due to a missing internal SSH plugin method.

* Standard IO forwarding accidentally configured the replacement ``stdout`` and
``stderr`` write descriptors as non-blocking, causing subprocesses that
generate more output than kernel buffer space existed to throw errors. The
Expand All @@ -210,6 +213,7 @@ the bug reports and pull requests in this release contributed by
`Ayaz Ahmed Khan <https://github.com/ayaz>`_,
`Colin McCarthy <https://github.com/colin-mccarthy>`_,
`Dan Quackenbush <https://github.com/danquack>`_,
`dsgnr <https://github.com/dsgnr>`_,
`Duane Zamrok <https://github.com/dewthefifth>`_,
`falbanese <https://github.com/falbanese>`_,
`Gonzalo Servat <https://github.com/gservat>`_,
Expand Down

0 comments on commit 2e3d04b

Please sign in to comment.