Also install plugins from setup.py and don't log notify as info level

This commit is contained in:
Gina Häußge 2014-09-07 17:28:50 +02:00
parent 3f2fdb0b14
commit 1bdc167f7a
2 changed files with 2 additions and 2 deletions

View file

@ -220,7 +220,7 @@ def params():
packages = find_packages(where="src")
package_dir = {"octoprint": "src/octoprint"}
package_data = {"octoprint": package_data_dirs('src/octoprint', ['static', 'templates'])}
package_data = {"octoprint": package_data_dirs('src/octoprint', ['static', 'templates', 'plugins'])}
include_package_data = True
zip_safe = False

View file

@ -266,7 +266,7 @@ class DiscoveryPlugin(octoprint.plugin.types.StartupPlugin,
location = "http://{addr}:{port}/plugin/discovery/discovery.xml".format(addr=addr, port=port)
self.logger.info("Sending NOTIFY alive")
self.logger.debug("Sending NOTIFY alive")
notify_message = "".join(["NOTIFY * HTTP/1.1\r\n", "Server: Python/2.7\r\n", "Cache-Control: max-age=900\r\n", "Location: {location}\r\n", "NTS: {nts}\r\n", "NT: upnp:rootdevice\r\n", "USN: uuid:{uuid}::upnp:rootdevice\r\n", "Host: 239.255.255.250:1900\r\n\r\n"])
message = notify_message.format(uuid=UUID, location=location, nts="ssdp:alive" if alive else "ssdp:byebye")
for _ in xrange(2):