Przeglądaj źródła

Determine webclient path by the python module it is contained in

tags/v0.5.0^2
Mark Haines 9 lat temu
rodzic
commit
dca3ba2f77
2 zmienionych plików z 5 dodań i 2 usunięć
  1. +1
    -1
      demo/start.sh
  2. +4
    -1
      synapse/app/homeserver.py

+ 1
- 1
demo/start.sh Wyświetl plik

@@ -41,6 +41,6 @@ for port in 8080 8081 8082; do
done

echo "Starting webclient on port 8000..."
python "demo/webserver.py" -p 8000 -P "$DIR/webserver.pid" "webclient"
python "demo/webserver.py" -p 8000 -P "$DIR/webserver.pid" "syweb/webclient"

cd "$CWD"

+ 4
- 1
synapse/app/homeserver.py Wyświetl plik

@@ -42,6 +42,7 @@ import os
import re
import sys
import sqlite3
import syweb

logger = logging.getLogger(__name__)

@@ -58,7 +59,9 @@ class SynapseHomeServer(HomeServer):
return JsonResource()

def build_resource_for_web_client(self):
return File("webclient") # TODO configurable?
syweb_path = os.path.dirname(syweb.__file__)
webclient_path = os.path.join(syweb_path, "webclient")
return File(webclient_path) # TODO configurable?

def build_resource_for_content_repo(self):
return ContentRepoResource(


Ładowanie…
Anuluj
Zapisz