From 1bdc167f7a67ccba6ca05e4244e297cac1972ef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Sun, 7 Sep 2014 17:28:50 +0200 Subject: [PATCH] Also install plugins from setup.py and don't log notify as info level --- setup.py | 2 +- src/octoprint/plugins/discovery/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 97888129..d6b6cb4b 100644 --- a/setup.py +++ b/setup.py @@ -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 diff --git a/src/octoprint/plugins/discovery/__init__.py b/src/octoprint/plugins/discovery/__init__.py index 42b28b3e..2e8c3462 100644 --- a/src/octoprint/plugins/discovery/__init__.py +++ b/src/octoprint/plugins/discovery/__init__.py @@ -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):