aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeterminant <[email protected]>2015-07-21 01:28:46 +0800
committerDeterminant <[email protected]>2015-07-21 01:28:46 +0800
commit0e1850f848535df5b1d89f0d879ea6a0f541cc19 (patch)
treedf13808c612a3f0f6b0530ef383dd690fd9bc1ce
parent998fea341d9caa665d4e6b8e54f89a82636cd9b8 (diff)
parentd789bc10fa85233e4322b795bec7b64806f123a0 (diff)
Merge branch 'master' of github.com:Determinant/lab_monitor
-rw-r--r--lab_monitor_server.py4
-rw-r--r--server_settings.example.cfg4
2 files changed, 4 insertions, 4 deletions
diff --git a/lab_monitor_server.py b/lab_monitor_server.py
index 91bdbb9..cb48cf9 100644
--- a/lab_monitor_server.py
+++ b/lab_monitor_server.py
@@ -136,8 +136,8 @@ if __name__ == '__main__':
format='[%(levelname)-7s] (%(threadName)-10s) %(message)s',)
MAX_LENGTH = 65536
MAX_RECORDS = 32
- HTTP_PORT = config.get('HTTP', 'port') or 2333
- SOCKET_PORT = config.get('socket', 'port') or 2334
+ HTTP_PORT = config.getint('HTTP', 'port') or 2333
+ SOCKET_PORT = config.getint('socket', 'port') or 2334
HOST = ''
lock = RWLock()
diff --git a/server_settings.example.cfg b/server_settings.example.cfg
index 387b054..d927f36 100644
--- a/server_settings.example.cfg
+++ b/server_settings.example.cfg
@@ -1,4 +1,4 @@
[HTTP]
- port: 2333
+port: 2333
[socket]
- port: 2334
+port: 2334