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

for 36049, log current connected master and make status module more useful and efficient #36202

Merged
merged 1 commit into from
Sep 11, 2016

Conversation

hu-dabao
Copy link
Contributor

What does this PR do?

This is for feature request in #36049.
More than that, I change module status a little bit. Make a return value so that the module itself will not just be a trigger for events but return the master connection info as well.
Also, refactor module status for code optimization and better code efficiency.

What issues does this PR fix or reference?

Previous Behavior

Detailed in #36049

New Behavior

2016-09-09 22:27:46,629 [salt.minion      ][INFO    ][17978] Connected to master this-is-a-master.com

Tests written?

No

Please review Salt's Contributing Guide for best practices.

@hu-dabao
Copy link
Contributor Author

hu-dabao commented Sep 10, 2016

If anyone can help me know why the lint job is failed I will be really appreciative ;P
No violation though: https://jenkins.saltstack.com/job/PR/job/salt-pr-lint-n/5145/violations/

@cachedout cachedout merged commit 5a7a723 into saltstack:carbon Sep 11, 2016
skizunov added a commit to skizunov/salt that referenced this pull request Sep 27, 2016
The following error occurs when the salt-minion runs using Python 3:
  File "...\bin\lib\site-packages\salt\minion.py", line 1880,
    in handle_event
      elif package.startswith('__schedule_return'):
      TypeError: startswith first arg must be bytes or a tuple of bytes,
      not str

Use `tag` instead of `package` when reading the tag names just like
every other case.

Broken by PR saltstack#36202.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants