Changeset 13937 in genesis

Timestamp:

Jul 6, 2017, 9:10:48 AM (7 years ago)

Author:

rick

Message:

Add static files generating on update

File:

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

tools/gformat.py

@@ -1469 +1469 @@
 
 
+def generate_static(output_dir, logging=True):
+  items = {'output_dir' : output_dir}
+  for node in get_hostlist():
+    items['node'] = node
+    items['wdir'] = "%(output_dir)s/%(node)s" % items
+    if not os.path.isdir(items['wdir']):
+      os.makedirs(items['wdir'])
+    datadump = get_yaml(node)
+    f = open("%(wdir)s/index.html" % items, "w")
+    f.write(generate_node_overview(items['node'], datadump))
+    f.close()
+    for config in files:
+      items['config'] = config
+      if logging: logger.info("## Generating %(node)s %(config)s" % items)
+      f = open("%(wdir)s/%(config)s" % items, "w")
+      f.write(generate_config(node, config, datadump))
+      f.close()
+
+
+
 def process_cgi_request(environ=os.environ):
   """ When calling from CGI """
@@ -1480 +1500 @@
     output += subprocess.Popen([SVN, 'cleanup', "%s/.." % NODE_DIR], stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0]
     output += subprocess.Popen([SVN, 'up', "%s/.." % NODE_DIR], stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0]
+    generate_static(CACHE_DIR, False)
     output += "[INFO] All done, redirecting in 5 seconds"
     response_headers += [
@@ -1875 +1896 @@
       print_cgi_response(response_headers, output)
     elif sys.argv[1] == "static":
-      items = dict()
-      items['output_dir'] = sys.argv[2] if len(sys.argv) > 2 else "./static"
-      for node in get_hostlist():
-        items['node'] = node
-        items['wdir'] = "%(output_dir)s/%(node)s" % items
-        if not os.path.isdir(items['wdir']):
-          os.makedirs(items['wdir'])
-        datadump = get_yaml(node)
-        f = open("%(wdir)s/index.html" % items, "w")
-        f.write(generate_node_overview(items['node'], datadump))
-        f.close()
-        for config in files:
-          items['config'] = config
-          logger.info("## Generating %(node)s %(config)s" % items)
-          f = open("%(wdir)s/%(config)s" % items, "w")
-          f.write(generate_config(node, config, datadump))
-          f.close()
+      generate_static(sys.argv[2] if len(sys.argv) > 2 else "./static")
     elif sys.argv[1] == "wind-export":
       items = dict()