generate-config: make unsupported directive functionality available to other templates

Author: oschaaf

test/genconf/nginx.conf.template

@@ -18,9 +18,6 @@ ${
 
 import string
 from util import *
-import warnings
-
-set_writer(emit)
 
 pagespeed_unsupported = [
     "CacheFlushFileName",
@@ -58,6 +55,8 @@ pagespeed_unsupported = [
     "UsePerVHostStatistics",
 ]
 
+set_writer(emit)
+set_pagespeed_unsupported(pagespeed_unsupported)
 
 def write_servers_open_item(server, level):
     emit_indent("server{\n", level)
@@ -95,9 +94,6 @@ def write_pagespeed_open(ps, level):
     # pagespeed_if is not implemented yet for nginx.
     # this code isn't wired up but left in as an example
     for key in ps:
-    	if key.lower() in map(str.lower,pagespeed_unsupported):
-	   warnings.warn("%s not supported, skipping" % key)
-	   continue
         val = ps[key]
         # In pagespeed.debug.conf, the same pagespeed directive can occur
         # multiple times. Our pyconf represents that as an array, which we

test/genconf/util.py

@@ -14,8 +14,10 @@
 #
 # Author: [email protected] (Otto van der Schaaf)
 
+from collections import OrderedDict
 import sys
 import traceback
+import warnings
 
 class Error(Exception):
     pass
@@ -32,6 +34,28 @@ def exec_template_call(func, lineno, item, level):
         pyconf_fatal(lineno, e)
         raise
 
+def check_pagespeed_supported(directives):
+    global global_pagespeed_unsupported
+    pagespeed_unsupported = None
+
+    try:
+        pagespeed_unsupported = global_pagespeed_unsupported
+    except NameError:
+        pagespeed_unsupported = None
+
+    if not pagespeed_unsupported:
+        return directives
+
+    supported_directives = OrderedDict()
+
+    for directive in directives:
+        if directive.lower() in map(str.lower, pagespeed_unsupported):
+            warnings.warn("%s not supported, skipping" % directive)
+        else:
+            supported_directives[directive] = directives[directive]
+
+    return supported_directives
+
 def write_cfg(key_to_writer, config, key_to_node, level=0, parent_key = ""):
     global global_writer
 
@@ -49,6 +73,9 @@ def write_cfg(key_to_writer, config, key_to_node, level=0, parent_key = ""):
             if w != write_void:
                 next_level = next_level + 1
 
+            if key.lower() == "pagespeed":
+                config[key] = check_pagespeed_supported(config[key])
+
             handled = exec_template_call(w, lineno, config[key], level)
 
             if not handled:
@@ -97,3 +124,7 @@ def write_void(ps, level):
 def set_writer(writer):
     global global_writer
     global_writer = writer
+
+def set_pagespeed_unsupported(pagespeed_unsupported):
+    global global_pagespeed_unsupported
+    global_pagespeed_unsupported = pagespeed_unsupported