nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-06-10 11:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Converted hosting and consuming to defaultdicts.

Browse Source 
Accessing the data is easier, no getters needed.
This commit is contained in:
Nick Daly 2012-05-29 18:39:12 -05:00
parent f5c38fdf8c
commit 118acf5c39
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ugly_hacks/santiago/santiago.py
View File

@ -269,7 +269,7 @@ class Santiago(object):
try:
self.outgoing_request(
host, self.me, host, self.me,
service, None, self.get_client_locations(host, "santiago"))
service, None, self.consuming[host]["santiago"])
except Exception as e:
logging.exception("Couldn't handle %s.%s", host, service)
@ -297,7 +297,7 @@ class Santiago(object):
sign=self.me)
# FIXME use urlparse.urlparse instead!
for destination in self.get_client_locations(host, "santiago"):
for destination in self.consuming[host]["santiago"]:
protocol = destination.split(":")[0]
self.senders[protocol].outgoing_request(request, destination)
@ -454,8 +454,8 @@ class Santiago(object):
self.outgoing_request(
self.me, client, self.me, client,
service, self.get_host_locations(client, service),
self.get_host_locations(client, "santiago"))
service, self.hosting[client][service],
self.hosting[client]["santiago"])
def proxy(self, request):
"""Pass off a request to another Santiago.
@ -692,8 +692,13 @@ if __name__ == "__main__":
"ssl_private_key": cert }, }
senders = { "https": { "proxy_host": "localhost",
"proxy_port": 8118} }
hosting = { mykey: { "santiago": set( ["https://localhost:8080"] )}}
consuming = { mykey: { "santiago": set( ["https://localhost:8080"] )}}
hosting = DefaultDict(None,
{ mykey: DefaultDict(None,
{ "santiago": set(["https://localhost:8080"]) }), })
consuming = DefaultDict(None,
{ mykey: DefaultDict(None,
{ "santiago": set(["https://localhost:8080"]) }), })
santiago = Santiago(listeners, senders,
hosting, consuming,