~loggerhead-team/loggerhead/trunk-rich

Committer: Michael Hudson
Date: 2008-03-06 21:13:06 UTC
mfrom: <a title="Merged From 148.2.1" href="/~loggerhead-team/loggerhead/trunk-rich/revision/148.2.1?remember=148.3.6">(148.2.1 loggerhead)
mto: This revision was merged to the branch mainline in revision 150 .
Revision ID: michael.hudson@canonical.com-20080306211306-mxisclbe1coownoz

merge in Mattias Eriksson's bundle

added added

removed removed

turbogears.update_config(configfile="dev.cfg", modulename="loggerhead.config")

potential_overrides = [ ('server.socket_port', int), ('server.webpath', str), ('server.thread_pool', int) ]

potential_overrides = [ ('server.socket_port', int), ('server.webpath', str), ('server.thread_pool', int), ('server.socket_host' ,str) ]

for key, keytype in potential_overrides:

value = config.get(key, None)

if value is not None: