From e7d9f73e1e47cb16a4c38632bad4c724bc931a69 Mon Sep 17 00:00:00 2001 From: grossmj Date: Wed, 30 Apr 2014 10:17:45 -0600 Subject: [PATCH] Display the ZeroMQ version when the server starts. Fixes #8. --- gns3server/modules/dynamips/__init__.py | 2 +- gns3server/server.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gns3server/modules/dynamips/__init__.py b/gns3server/modules/dynamips/__init__.py index 002f59ce..326e21dc 100644 --- a/gns3server/modules/dynamips/__init__.py +++ b/gns3server/modules/dynamips/__init__.py @@ -500,6 +500,6 @@ class Dynamips(IModule): try: response = self._get_windows_interfaces() except ImportError: - self.send_custom_error("Optional pywin32 module is not installed, please install it on the server to get the available interface names") + self.send_custom_error("pywin32 module is not installed, please install it on the server to get the available interface names") return self.send_response(response) diff --git a/gns3server/server.py b/gns3server/server.py index e8104fc7..b8462ee3 100644 --- a/gns3server/server.py +++ b/gns3server/server.py @@ -145,10 +145,11 @@ class Server(object): debug=True) # FIXME: debug mode! try: - print("Starting server on {}:{} (Tornado v{}, PyZMQ v{})".format(self._host, - self._port, - tornado.version, - zmq.__version__)) + print("Starting server on {}:{} (Tornado v{}, PyZMQ v{}, ZMQ v{})".format(self._host, + self._port, + tornado.version, + zmq.__version__, + zmq.zmq_version())) kwargs = {"address": self._host} if parse_version(tornado.version) >= parse_version("3.1"): kwargs["max_buffer_size"] = 524288000 # 500 MB file upload limit