Skip to content
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

SSH Runner: Fix several issues and refactor code #17357

Open
wants to merge 8 commits into
base: develop2
Choose a base branch
from
Open

SSH Runner: Fix several issues and refactor code #17357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7108a2b
Fix several issues on SSH runner and refactor code
perseoGI Nov 20, 2024
7b364da
Log errors blocking and some improvements
perseoGI Nov 21, 2024
f4c45bb
Fixed '&' bug and more refactors
perseoGI Nov 22, 2024
8782ccd
Private import
perseoGI Nov 22, 2024
70e8446
Follow issue reference
perseoGI Nov 22, 2024
5e21b34
Protect possible exception
perseoGI Dec 5, 2024
49e3f39
Update remote and improve logging
perseoGI Dec 9, 2024
5032b3c
Apply suggestions from code review
perseoGI Dec 20, 2024
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
7 changes: 5 additions & 2 deletions conan/api/output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def rewrite_line(self, line):
self.stream.flush()
self._color = tmp_color

def _write_message(self, msg, fg=None, bg=None):
def _write_message(self, msg, fg=None, bg=None, newline=True):
if isinstance(msg, dict):
# For traces we can receive a dict already, we try to transform then into more natural
# text
Expand All @@ -206,8 +206,11 @@ def _write_message(self, msg, fg=None, bg=None):
else:
ret += "{}".format(msg)

if newline:
ret = "%s\n" % ret

with self.lock:
self.stream.write("{}\n".format(ret))
self.stream.write(ret)
self.stream.flush()

def trace(self, msg):
Expand Down
2 changes: 1 addition & 1 deletion conan/cli/commands/create.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def create(conan_api, parser, *args):
raise ConanException(f"Invalid runner configuration. 'type' must be defined")
runner_instances_map = {
'docker': DockerRunner,
# 'ssh': SSHRunner,
'ssh': SSHRunner,
# 'wsl': WSLRunner,
}
try:
Expand Down
Loading
Loading