Changeset 4152

Timestamp:

22/01/10 12:28:26 (8 months ago)

Author:

alo

Message:

Adds output language selection to the POST progress report handler.

Location:

cherokee/trunk/cherokee

Files:

• dwriter.c (modified) (1 diff)
• error_list.py (modified) (1 diff)
• handler_post_report.c (modified) (4 diffs)
• handler_post_report.h (modified) (1 diff)

cherokee/trunk/cherokee/dwriter.c

@@ -446 +446 @@
 
         if (equal_buf_str (buf, "ruby")) {
-                props->lang = dwriter_ruby;
+                *lang = dwriter_ruby;
                 return ret_ok;
         }

cherokee/trunk/cherokee/error_list.py

@@ -260 +260 @@
 
 
+# cherokee/handler_post_report.c
+#
+e('HANDLER_POST_REPORT_LANG',
+  title = "Unrecognized language '%s'",
+  desc  = "Cherokee's POST status reporter supports a number of output languages and formats, including: JSON, Python, PHP and Ruby.")
+
+
 # cherokee/handler_dbslayer.c
 #

cherokee/trunk/cherokee/handler_post_report.c

@@ -50 +50 @@
                                         cherokee_module_props_t **_props)
 {
+        ret_t                                 ret;
         cherokee_list_t                      *i;
         cherokee_handler_post_report_props_t *props;
@@ -60 +61 @@
                 cherokee_module_props_init_base (MODULE_PROPS(n),
                                                  MODULE_PROPS_FREE(props_free));
-
+                n->lang = dwriter_json;
                 *_props = MODULE_PROPS(n);
         }
@@ -68 +69 @@
         cherokee_config_node_foreach (i, conf) {
                 cherokee_config_node_t *subconf = CONFIG_NODE(i);
-                UNUSED (subconf);
+
+                ret = cherokee_dwriter_lang_to_type (&subconf->val, &props->lang);
+                if (ret != ret_ok) {
+                        LOG_CRITICAL (CHEROKEE_ERROR_HANDLER_POST_REPORT_LANG, subconf->val.buf);
+                        return ret_error;
+                }
         }
 
@@ -108 +114 @@
 
         n->writer.pretty = true;
-        n->writer.lang   = dwriter_json;
+        n->writer.lang   = PROP_POST_REPORT(props)->lang;
 
         cherokee_dwriter_set_buffer (&n->writer, &n->buffer);

cherokee/trunk/cherokee/handler_post_report.h

@@ -38 +38 @@
 typedef struct {
         cherokee_module_props_t  base;
+        cherokee_dwriter_lang_t  lang;
 } cherokee_handler_post_report_props_t;