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.

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

Fix cylc message by SSH #2464

Merged
merged 3 commits into from
Nov 3, 2017
Merged

Conversation

matthewrmshin
Copy link
Contributor

Fix #2463 (no frills). Main points:

  • Handle cylc message --env=KEY=VALUE ....
  • Fix typo that causes the logic in cylc.suite_srv_files_mgr to fail to load contact file on the server side.
  • Don't scp passphrase and SSL certificate files if remote host is on SSH+HTTP(S) messaging.
  • Ensure cylc message on remote host fails when it fails to talk back via SSH communication.
  • Fix broken test.

@matthewrmshin matthewrmshin added the bug Something is wrong :( label Oct 30, 2017
@matthewrmshin matthewrmshin added this to the next release milestone Oct 30, 2017
@matthewrmshin matthewrmshin self-assigned this Oct 30, 2017
@matthewrmshin matthewrmshin force-pushed the fix-ssh-messaging branch 2 times, most recently from 6c8ba00 to 833b6a4 Compare November 1, 2017 09:30
env[var] = self.env_map.get(var, 'UNSET')
try:
env[var] = self.env_map[var]
except:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

except KeyError?

@hjoliver
Copy link
Member

hjoliver commented Nov 3, 2017

Just to note, environment variables were originally handled generically by bin/cylc, not just for task messaging. I think the original intent was for other client commands in task job scripts #2214 as well, with ssh messaging ... but from a quick look in the code it appears only task messaging ever used the env argument. So I guess this is fine for now.

@oliver-sanders oliver-sanders merged commit 228c14a into cylc:master Nov 3, 2017
@matthewrmshin matthewrmshin deleted the fix-ssh-messaging branch November 3, 2017 11:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something is wrong :(
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants