aboutsummaryrefslogtreecommitdiffstats
path: root/fg21sim
diff options
context:
space:
mode:
authorAaron LI <aaronly.me@outlook.com>2016-11-15 18:23:00 +0800
committerAaron LI <aaronly.me@outlook.com>2016-11-15 18:23:00 +0800
commite74ccdc92478ceb50aa2617e21f6f7eb4bc181de (patch)
treeca0832af2e1e0132edf68f756dc854fc24cc6958 /fg21sim
parentbcdc84fb416820493e048fe28ca59e9090762ffb (diff)
downloadfg21sim-e74ccdc92478ceb50aa2617e21f6f7eb4bc181de.tar.bz2
webui: Place handlers under the directory "hnadlers/"
Diffstat (limited to 'fg21sim')
-rw-r--r--fg21sim/webui/handlers/__init__.py1
-rw-r--r--fg21sim/webui/handlers/console.py (renamed from fg21sim/webui/consolehandler.py)2
-rw-r--r--fg21sim/webui/handlers/log.py (renamed from fg21sim/webui/loghandler.py)0
-rw-r--r--fg21sim/webui/handlers/websocket.py (renamed from fg21sim/webui/websocket.py)6
4 files changed, 5 insertions, 4 deletions
diff --git a/fg21sim/webui/handlers/__init__.py b/fg21sim/webui/handlers/__init__.py
index f97ef07..0c01ea7 100644
--- a/fg21sim/webui/handlers/__init__.py
+++ b/fg21sim/webui/handlers/__init__.py
@@ -3,3 +3,4 @@
from .index import IndexHandler
from .login import LoginHandler
+from .websocket import FG21simWSHandler
diff --git a/fg21sim/webui/consolehandler.py b/fg21sim/webui/handlers/console.py
index 54d4305..fe1b500 100644
--- a/fg21sim/webui/consolehandler.py
+++ b/fg21sim/webui/handlers/console.py
@@ -12,7 +12,7 @@ from concurrent.futures import ThreadPoolExecutor
import tornado.ioloop
import tornado.gen
-from .loghandler import WebSocketLogHandler
+from .log import WebSocketLogHandler
logger = logging.getLogger(__name__)
diff --git a/fg21sim/webui/loghandler.py b/fg21sim/webui/handlers/log.py
index 0b457b5..0b457b5 100644
--- a/fg21sim/webui/loghandler.py
+++ b/fg21sim/webui/handlers/log.py
diff --git a/fg21sim/webui/websocket.py b/fg21sim/webui/handlers/websocket.py
index 00bda03..7db953c 100644
--- a/fg21sim/webui/websocket.py
+++ b/fg21sim/webui/handlers/websocket.py
@@ -24,9 +24,9 @@ import logging
import tornado.websocket
from tornado.options import options
-from .consolehandler import ConsoleHandler
-from .utils import get_host_ip, ip_in_network
-from ..errors import ConfigError
+from .console import ConsoleHandler
+from ..utils import get_host_ip, ip_in_network
+from ...errors import ConfigError
logger = logging.getLogger(__name__)