Skip to content

Temporary fix for the client_id generation (fixes #8315) #8336

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

Merged
balloob merged 4 commits into from
Jul 5, 2017
Merged

Temporary fix for the client_id generation (fixes #8315) #8336

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b60400
Temporary fix for the client_id generation (fixes #8315)
fabaff Jul 4, 2017
f2fee65
Fix comment
fabaff Jul 4, 2017
e7ca07f
Move client id setting.
balloob Jul 5, 2017
2277606
Lint
balloob Jul 5, 2017
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
4 changes: 4 additions & 0 deletions homeassistant/components/mqtt/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,10 @@ def async_setup(hass, config):
client_cert = conf.get(CONF_CLIENT_CERT)
tls_insecure = conf.get(CONF_TLS_INSECURE)
protocol = conf[CONF_PROTOCOL]

@houndci-bot houndci-bot Jul 5, 2017

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

blank line contains whitespace

# hbmqtt requires a client id to be set.
if client_id is None:
client_id = 'home-assistant'
elif broker_config:
# If no broker passed in, auto config to internal server
broker, port, username, password, certificate, protocol = broker_config
Expand Down