diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2012-09-21 23:27:12 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2012-09-21 23:27:12 +0200 |
| commit | 7007ebe7710d29f26696de16407beced6dbacb6c (patch) | |
| tree | c2bebbe1fc243fae6622804f708c6e2c87408ca4 /module/web | |
| parent | merge newest changes (diff) | |
| download | pyload-7007ebe7710d29f26696de16407beced6dbacb6c.tar.xz | |
added websocket backend, removed thrift
Diffstat (limited to 'module/web')
| -rw-r--r-- | module/web/templates/default/base.html | 5 | ||||
| -rw-r--r-- | module/web/utils.py | 5 | ||||
| -rw-r--r-- | module/web/webinterface.py | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index f193db75c..99b5b11ff 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -3,8 +3,8 @@ <head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>{% block title %}pyLoad {{ _("WebUI") }}{% endblock %}</title>
- <meta name="description" content="pyLoad {{ _("Webinterface") }}">
+ <title>{% block title %}pyLoad WebUI{% endblock %}</title>
+ <meta name="description" content="pyLoad WebUI">
<meta name="viewport" content="width=device-width">
<!-- TODO Include this font -->
@@ -13,7 +13,6 @@ <link href="static/css/font.css" rel="stylesheet" type="text/css"/>
<link href="static/css/default/style.less" rel="stylesheet/less" type="text/css" media="screen"/>
-
<script src="static/js/libs/less-1.3.0.min.js" type="text/javascript"></script>
<script type="text/javascript" data-main="static/js/default" src="static/js/libs/require-2.0.6.js"></script>
<script>
diff --git a/module/web/utils.py b/module/web/utils.py index 967fc3412..1c0b81338 100644 --- a/module/web/utils.py +++ b/module/web/utils.py @@ -99,8 +99,11 @@ def login_required(perm=None): class CherryPyWSGI(ServerAdapter): + + numthreads = 6 + def run(self, handler): from wsgiserver import CherryPyWSGIServer - server = CherryPyWSGIServer((self.host, self.port), handler) + server = CherryPyWSGIServer((self.host, self.port), handler, numthreads=self.numthreads) server.start() diff --git a/module/web/webinterface.py b/module/web/webinterface.py index 75907a0a8..ae97406c7 100644 --- a/module/web/webinterface.py +++ b/module/web/webinterface.py @@ -133,16 +133,17 @@ def run_lightweight(host="0.0.0.0", port="8000"): run(app=web, host=host, port=port, quiet=True, server="bjoern") -def run_threaded(host="0.0.0.0", port="8000", threads=3, cert="", key=""): +def run_threaded(host="0.0.0.0", port="8000", threads=6, cert="", key=""): from wsgiserver import CherryPyWSGIServer if cert and key: CherryPyWSGIServer.ssl_certificate = cert CherryPyWSGIServer.ssl_private_key = key - CherryPyWSGIServer.numthreads = threads + # todo: threads configurable from utils import CherryPyWSGI + CherryPyWSGI.numthreads = threads run(app=web, host=host, port=port, server=CherryPyWSGI, quiet=True) |