chiark
/
gitweb
/
~mdw
/
hippotat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
do actually process server-specific [<server> LIMIT] sections
[hippotat]
/
hippotatlib
/
__init__.py
diff --git
a/hippotatlib/__init__.py
b/hippotatlib/__init__.py
index 397dfb2c23459cf4f9a7c17bd4064b63cec2e215..aa5b06c49385c0b7268a8fc16c60c74555254676 100644
(file)
--- a/
hippotatlib/__init__.py
+++ b/
hippotatlib/__init__.py
@@
-110,7
+110,8
@@
def logevent_is_boringtwisted(event):
if dflag is None and DBG.TWISTED in debug_set: return False
return True
except Exception:
if dflag is None and DBG.TWISTED in debug_set: return False
return True
except Exception:
- print(traceback.format_exc(), file=org_stderr)
+ print('EXCEPTION (IN BORINGTWISTED CHECK)',
+ traceback.format_exc(), file=org_stderr)
return False
@implementer(twisted.logger.ILogFilterPredicate)
return False
@implementer(twisted.logger.ILogFilterPredicate)
@@
-125,7
+126,7
@@
class LogNotBoringTwisted:
#---------- default config ----------
defcfg = '''
#---------- default config ----------
defcfg = '''
-[
DEFAULT
]
+[
COMMON
]
max_batch_down = 65536
max_queue_time = 10
target_requests_outstanding = 3
max_batch_down = 65536
max_queue_time = 10
target_requests_outstanding = 3
@@
-136,22
+137,22
@@
max_batch_up = 4000
http_retry = 5
port = 80
vroutes = ''
http_retry = 5
port = 80
vroutes = ''
+ifname_client = hippo%%d
+ifname_server = shippo%%d
#[server] or [<client>] overrides
#[server] or [<client>] overrides
-ipif = userv root ipif %(local)s,%(peer)s,%(mtu)s,slip %(rnets)s
+ipif = userv root ipif %(local)s,%(peer)s,%(mtu)s,slip
,%(ifname)s
%(rnets)s
# relating to virtual network
mtu = 1500
# relating to virtual network
mtu = 1500
-[SERVER]
-server = SERVER
# addrs = 127.0.0.1 ::1
# url
# relating to virtual network
vvnetwork = 172.24.230.192
# vnetwork = <prefix>/<len>
# addrs = 127.0.0.1 ::1
# url
# relating to virtual network
vvnetwork = 172.24.230.192
# vnetwork = <prefix>/<len>
-# vadd
r
= <ipaddr>
+# vadd
r
= <ipaddr>
# vrelay = <ipaddr>
# vrelay = <ipaddr>
@@
-385,11
+386,12
@@
def _cfg_process_putatives():
server_pat = r'[-.0-9A-Za-z]+'
client_pat = r'[.:0-9a-f]+'
server_re = regexp.compile(server_pat)
server_pat = r'[-.0-9A-Za-z]+'
client_pat = r'[.:0-9a-f]+'
server_re = regexp.compile(server_pat)
- serverclient_re = regexp.compile(server_pat + r' ' + client_pat)
+ serverclient_re = regexp.compile(
+ server_pat + r' ' + '(?:' + client_pat + '|LIMIT)')
for cs in cfg.sections():
for cs in cfg.sections():
- if cs == 'LIMIT':
- # plan A "[LIMIT]"
+ if cs == 'LIMIT'
or cs == 'COMMON'
:
+ # plan A "[LIMIT]"
or "[COMMON]"
continue
try:
continue
try:
@@
-432,8
+434,8
@@
def _cfg_process_putatives():
return (servers, clients)
return (servers, clients)
-def cfg_process_
common
(c, ss):
- c.mtu = cfg
.
getint(ss, 'mtu')
+def cfg_process_
general
(c, ss):
+ c.mtu = cfg
1
getint(ss, 'mtu')
def cfg_process_saddrs(c, ss):
class ServerAddr():
def cfg_process_saddrs(c, ss):
class ServerAddr():
@@
-459,20
+461,20
@@
def cfg_process_saddrs(c, ss):
def __repr__(self):
return 'ServerAddr'+repr((self.port,self.addr))
def __repr__(self):
return 'ServerAddr'+repr((self.port,self.addr))
- c.port = cfg
.
getint(ss,'port')
+ c.port = cfg
1
getint(ss,'port')
c.saddrs = [ ]
c.saddrs = [ ]
- for addrspec in cfg
.
get(ss, 'addrs').split():
+ for addrspec in cfg
1
get(ss, 'addrs').split():
sa = ServerAddr(c.port, addrspec)
c.saddrs.append(sa)
def cfg_process_vnetwork(c, ss):
sa = ServerAddr(c.port, addrspec)
c.saddrs.append(sa)
def cfg_process_vnetwork(c, ss):
- c.vnetwork = ipnetwork(cfg
.
get(ss,'vnetwork'))
+ c.vnetwork = ipnetwork(cfg
1
get(ss,'vnetwork'))
if c.vnetwork.num_addresses < 3 + 2:
raise ValueError('vnetwork needs at least 2^3 addresses')
def cfg_process_vaddr(c, ss):
try:
if c.vnetwork.num_addresses < 3 + 2:
raise ValueError('vnetwork needs at least 2^3 addresses')
def cfg_process_vaddr(c, ss):
try:
- c.vaddr = cfg
.
get(ss,'vaddr')
+ c.vaddr = cfg
1
get(ss,'vaddr')
except NoOptionError:
cfg_process_vnetwork(c, ss)
c.vaddr = next(c.vnetwork.hosts())
except NoOptionError:
cfg_process_vnetwork(c, ss)
c.vaddr = next(c.vnetwork.hosts())
@@
-483,13
+485,24
@@
def cfg_search_section(key,sections):
return section
raise NoOptionError(key, repr(sections))
return section
raise NoOptionError(key, repr(sections))
+def cfg_get_raw(*args, **kwargs):
+ # for passing to cfg_search
+ return cfg.get(*args, raw=True, **kwargs)
+
def cfg_search(getter,key,sections):
section = cfg_search_section(key,sections)
return getter(section, key)
def cfg_search(getter,key,sections):
section = cfg_search_section(key,sections)
return getter(section, key)
+def cfg1get(section,key, getter=cfg.get,**kwargs):
+ section = cfg_search_section(key,[section,'COMMON'])
+ return getter(section,key,**kwargs)
+
+def cfg1getint(section,key, **kwargs):
+ return cfg1get(section,key, getter=cfg.getint,**kwargs);
+
def cfg_process_client_limited(cc,ss,sections,key):
def cfg_process_client_limited(cc,ss,sections,key):
- val = cfg_search(cfg
.
getint, key, sections)
- lim = cfg_search(cfg
.
getint, key, ['%s LIMIT' % ss, 'LIMIT'])
+ val = cfg_search(cfg
1
getint, key, sections)
+ lim = cfg_search(cfg
1
getint, key, ['%s LIMIT' % ss, 'LIMIT'])
cc.__dict__[key] = min(val,lim)
def cfg_process_client_common(cc,ss,cs,ci):
cc.__dict__[key] = min(val,lim)
def cfg_process_client_common(cc,ss,cs,ci):
@@
-499,12
+512,12
@@
def cfg_process_client_common(cc,ss,cs,ci):
sections = ['%s %s' % (ss,cs),
cs,
ss,
sections = ['%s %s' % (ss,cs),
cs,
ss,
- '
DEFAULT
']
+ '
COMMON
']
try: pwsection = cfg_search_section('password', sections)
except NoOptionError: return None
try: pwsection = cfg_search_section('password', sections)
except NoOptionError: return None
- pw = cfg
.
get(pwsection, 'password')
+ pw = cfg
1
get(pwsection, 'password')
cc.password = pw.encode('utf-8')
cfg_process_client_limited(cc,ss,sections,'target_requests_outstanding')
cc.password = pw.encode('utf-8')
cfg_process_client_limited(cc,ss,sections,'target_requests_outstanding')
@@
-521,7
+534,7
@@
def cfg_process_ipif(c, sections, varmap):
#print('CFGIPIF',repr((varmap, sections, c.__dict__)),file=sys.stderr)
section = cfg_search_section('ipif', sections)
#print('CFGIPIF',repr((varmap, sections, c.__dict__)),file=sys.stderr)
section = cfg_search_section('ipif', sections)
- c.ipif_command = cfg
.
get(section,'ipif', vars=c.__dict__)
+ c.ipif_command = cfg
1
get(section,'ipif', vars=c.__dict__)
#---------- startup ----------
#---------- startup ----------
@@
-540,7
+553,7
@@
def common_startup(process_cfg):
def readconfig(pathname, mandatory=True):
def log(m, p=pathname):
if not DBG.CONFIG in debug_set: return
def readconfig(pathname, mandatory=True):
def log(m, p=pathname):
if not DBG.CONFIG in debug_set: return
- log_debug_config('%s: %s' % (m, p
athname
))
+ log_debug_config('%s: %s' % (m, p))
try:
files = os.listdir(pathname)
try:
files = os.listdir(pathname)