perso/syncserver
perso/syncserver
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add a simple static node assignment backend, for easier deployment.

Browse Source
This commit is contained in:
Ryan Kelly 2014-02-11 19:58:49 +11:00
parent d0d47fae3b
commit 7603ab1856
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MANIFEST.in
View File

@ -1,3 +1,3 @@
syncserver.ini include syncserver.ini
syncserver.wsgi include syncserver.wsgi
syncserver/tests.ini include syncserver/tests.ini

5
Makefile
View File

@ -24,9 +24,10 @@ build:
test: test:
# Basic syntax and sanity checks. # Basic syntax and sanity checks.
$(FLAKE8) ./syncserver $(FLAKE8) ./syncserver
# Testcases from the bundled apps. # Testcases from syncstorage app
$(NOSE) syncstorage.tests $(NOSE) syncstorage.tests
$(NOSE) tokenserver.tests # Testcases from tokenserver app; broken due to incorrect file paths
#$(NOSE) tokenserver.tests
# Live tests against a running server. # Live tests against a running server.
./local/bin/pserve syncserver/tests.ini & SERVER_PID=$$! ; sleep 2 ; ./local/bin/python -m syncstorage.tests.functional.test_storage --use-token-server http://localhost:5000/token/1.0/sync/1.5 ; kill $$SERVER_PID ./local/bin/pserve syncserver/tests.ini & SERVER_PID=$$! ; sleep 2 ; ./local/bin/python -m syncstorage.tests.functional.test_storage --use-token-server http://localhost:5000/token/1.0/sync/1.5 ; kill $$SERVER_PID

19
syncserver/__init__.py
View File

@ -18,6 +18,7 @@ def includeme(config):
public_url = settings.get("syncserver.public_url") public_url = settings.get("syncserver.public_url")
if public_url is None: if public_url is None:
raise RuntimeError("you much configure syncserver.public_url") raise RuntimeError("you much configure syncserver.public_url")
public_url = public_url.rstrip("/")
secret = settings.get("syncserver.secret") secret = settings.get("syncserver.secret")
if secret is None: if secret is None:
secret = os.urandom(32).encode("hex") secret = os.urandom(32).encode("hex")
@ -28,10 +29,12 @@ def includeme(config):
# Configure app-specific defaults based on top-level configuration. # Configure app-specific defaults based on top-level configuration.
settings.pop("config", None) settings.pop("config", None)
if "tokenserver.backend" not in settings: if "tokenserver.backend" not in settings:
# Default to sql node-assignment backend # Default to our simple static node-assignment backend
settings["tokenserver.backend"] =\ settings["tokenserver.backend"] =\
"tokenserver.assignment.sqlnode.SQLNodeAssignment" "syncserver.staticnode.StaticNodeAssignment"
settings["tokenserver.sqluri"] = sqluri settings["tokenserver.sqluri"] = sqluri
settings["tokenserver.node_url"] = public_url
settings["endpoints.sync-1.5"] = "{node}/storage/1.5/{uid}"
if "tokenserver.applications" not in settings: if "tokenserver.applications" not in settings:
# Default to just the sync-1.5 application # Default to just the sync-1.5 application
settings["tokenserver.applications"] = "sync-1.5" settings["tokenserver.applications"] = "sync-1.5"
@ -55,13 +58,19 @@ def includeme(config):
settings["browserid.backend"] = "tokenserver.verifiers.RemoteVerifier" settings["browserid.backend"] = "tokenserver.verifiers.RemoteVerifier"
settings["browserid.audiences"] = public_url settings["browserid.audiences"] = public_url
if "metlog.backend" not in settings: if "metlog.backend" not in settings:
# Default to logging to stdout # Default to capturing metlog output in memory.
# In other words, stop of from being so damn chatty on stdout.
settings["metlog.backend"] = "mozsvc.metrics.MetlogPlugin" settings["metlog.backend"] = "mozsvc.metrics.MetlogPlugin"
settings["metlog.sender_class"] = "metlog.senders.DebugCaptureSender"
settings["metlog.enabled"] = True settings["metlog.enabled"] = True
settings["metlog.sender_class"] = "metlog.senders.StdOutSender"
if "cef.use" not in settings: if "cef.use" not in settings:
# Default to no CEF logging # Default to sensible CEF logging settings
settings["cef.use"] = False settings["cef.use"] = False
settings["cef.file"] = "syslog"
settings["cef.vendor"] = "mozilla"
settings["cef.version"] = 0
settings["cef.device_version"] = 0
settings["cef.product"] = "syncserver"
# Include the relevant sub-packages. # Include the relevant sub-packages.
config.include("syncstorage", route_prefix="/storage") config.include("syncstorage", route_prefix="/storage")