From 724e3051fddee5ed106f8425a83adbbeb97a2507 Mon Sep 17 00:00:00 2001 From: grossmj Date: Thu, 24 Apr 2014 19:50:58 -0600 Subject: [PATCH] Send the server version when a client connects. --- gns3server/handlers/jsonrpc_websocket.py | 8 +++++++- gns3server/main.py | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gns3server/handlers/jsonrpc_websocket.py b/gns3server/handlers/jsonrpc_websocket.py index 32f8c9da..fa2b2fe9 100644 --- a/gns3server/handlers/jsonrpc_websocket.py +++ b/gns3server/handlers/jsonrpc_websocket.py @@ -22,8 +22,12 @@ JSON-RPC protocol over Websockets. import zmq import uuid import tornado.websocket +from ..version import __version__ from tornado.escape import json_decode -from ..jsonrpc import JSONRPCParseError, JSONRPCInvalidRequest, JSONRPCMethodNotFound, JSONRPCNotification +from ..jsonrpc import JSONRPCParseError +from ..jsonrpc import JSONRPCInvalidRequest +from ..jsonrpc import JSONRPCMethodNotFound +from ..jsonrpc import JSONRPCNotification import logging log = logging.getLogger(__name__) @@ -110,6 +114,8 @@ class JSONRPCWebSocket(tornado.websocket.WebSocketHandler): """ log.info("Websocket client {} connected".format(self.session_id)) + # send this server version when a client connects + self.write_message({"version": __version__}) self.clients.add(self) def on_message(self, message): diff --git a/gns3server/main.py b/gns3server/main.py index edd927ae..66f31f85 100644 --- a/gns3server/main.py +++ b/gns3server/main.py @@ -42,6 +42,9 @@ def locale_check(): This is to prevent UnicodeEncodeError with unicode paths when using standard library I/O operation methods (e.g. os.stat() or os.path.*) which rely on the system or user locale. + + More information can be found there: http://seasonofcode.com/posts/unicode-i-o-and-locales-in-python.html + or there: http://robjwells.com/post/61198832297/get-your-us-ascii-out-of-my-face """ # no need to check on Windows @@ -98,6 +101,8 @@ def main(): tornado.options.print_help() raise SystemExit + # check for the correct locale + # (UNIX/Linux only) locale_check() from tornado.options import options