Changeset 10860 in genesis

Timestamp:

May 15, 2012, 12:09:50 AM (13 years ago)

Author:

rick

Message:

Use some basic caching to speedup generation of config files while doing static
runs and/or unit-testing.

File:

• tools/gformat.py (modified) (5 diffs)

tools/gformat.py

@@ -95 +95 @@
 UNKNOWN = 90
 
+datadump_cache = {}
+
 def get_yaml(item):
   """ Get configuration yaml for 'item'"""
+  if datadump_cache.has_key(item):
+    return datadump_cache[item].copy()
+
   gfile = os.path.join(NODE_DIR,item,'wleiden.yaml')
 
@@ -136 +141 @@
   datadump['autogen_domain'] = datadump['domain'] if datadump.has_key('domain') else 'wleiden.net.'
   datadump['autogen_fqdn'] = datadump['autogen_realname'] + '.' + datadump['autogen_domain']
+  datadump_cache[item] = datadump.copy()
   return datadump
 
@@ -477 +483 @@
 
 
+ileiden_proxies = []
+normal_proxies = []
+rc_conf_local_cache = {}
 
 def generate_rc_conf_local(datadump):
   """ Generate configuration file '/etc/rc.conf.local' """
+  item = datadump['autogen_item']
+  if rc_conf_local_cache.has_key(item):
+    return rc_conf_local_cache[item]
+
   if not datadump.has_key('ileiden'):
     datadump['autogen_ileiden_enable'] = False
@@ -487 +500 @@
   datadump['autogen_ileiden_enable'] = switchFormat(datadump['autogen_ileiden_enable'])
 
-  ileiden_proxies = []
-  normal_proxies = []
-  for proxy in get_proxylist():
-    proxydump = get_yaml(proxy)
-    if proxydump['ileiden']:
-      ileiden_proxies.append(proxydump)
-    else:
-      normal_proxies.append(proxydump)
-  for host in get_hybridlist():
-    hostdump = get_yaml(host)
-    if hostdump['service_proxy_ileiden']:
-      ileiden_proxies.append(hostdump)
-    if hostdump['service_proxy_normal']:
-      normal_proxies.append(hostdump)
+  if not ileiden_proxies or not normal_proxies:
+    for proxy in get_proxylist():
+      proxydump = get_yaml(proxy)
+      if proxydump['ileiden']:
+        ileiden_proxies.append(proxydump)
+      else:
+        normal_proxies.append(proxydump)
+    for host in get_hybridlist():
+      hostdump = get_yaml(host)
+      if hostdump['service_proxy_ileiden']:
+        ileiden_proxies.append(hostdump)
+      if hostdump['service_proxy_normal']:
+        normal_proxies.append(hostdump)
 
   datadump['autogen_ileiden_proxies'] = ileiden_proxies
@@ -713 +725 @@
       output += "ipv4_addrs_%s='%s'\n\n" % (iface, " ".join([x[0] for x in addrs]))
 
+  rc_conf_local_cache[datadump['autogen_item']] = output
   return output