Apache 2.4 log.level supported.

matsumotory · Jul 6, 2012 · 689842e · 689842e
1 parent 06ba5c4
commit 689842e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/ap_mrb_init.c b/ap_mrb_init.c
@@ -80,10 +80,8 @@ int ap_mruby_class_init(mrb_state *mrb)
     mrb_define_method(mrb, class_server, "error_fname=", ap_mrb_set_server_error_fname, ARGS_ANY());
     mrb_define_method(mrb, class_server, "error_fname", ap_mrb_get_server_error_fname, ARGS_NONE());
     mrb_define_method(mrb, class_server, "document_root", ap_mrb_get_server_document_root, ARGS_NONE());
-#ifndef __APACHE24__
     mrb_define_method(mrb, class_server, "loglevel=", ap_mrb_set_server_loglevel, ARGS_ANY());
     mrb_define_method(mrb, class_server, "loglevel", ap_mrb_get_server_loglevel, ARGS_NONE());
-#endif
 
     class_request = mrb_define_class_under(mrb, class, "Request", mrb->object_class);
     mrb_define_method(mrb, class_request, "Initialize", ap_mrb_init_request, ARGS_NONE());

diff --git a/ap_mrb_server.c b/ap_mrb_server.c
@@ -32,19 +32,25 @@ mrb_value ap_mrb_get_server_document_root(mrb_state *mrb, mrb_value str)
 
 // int
 
-#ifndef __APACHE24__
 mrb_value ap_mrb_set_server_loglevel(mrb_state *mrb, mrb_value str)
 {
     mrb_int val;
     request_rec *r = ap_mrb_get_request();
     mrb_get_args(mrb, "i", &val);
+#ifdef __APACHE24__
+    r->server->log.level = (int)val;
+#else
     r->server->loglevel = (int)val;
+#endif
     return str;
 }
 
 mrb_value ap_mrb_get_server_loglevel(mrb_state *mrb, mrb_value str)
 {
     request_rec *r = ap_mrb_get_request();
+#ifdef __APACHE24__
+    return mrb_fixnum_value(r->server->log.level);
+#else
     return mrb_fixnum_value(r->server->loglevel);
-}
 #endif
+}
diff --git a/ap_mrb_server.h b/ap_mrb_server.h
@@ -14,9 +14,7 @@
 mrb_value ap_mrb_set_server_error_fname(mrb_state *mrb, mrb_value str);
 mrb_value ap_mrb_get_server_error_fname(mrb_state *mrb, mrb_value str);
 mrb_value ap_mrb_get_server_document_root(mrb_state *mrb, mrb_value str);
-#ifndef __APACHE24__
 mrb_value ap_mrb_set_server_loglevel(mrb_state *mrb, mrb_value str);
 mrb_value ap_mrb_get_server_loglevel(mrb_state *mrb, mrb_value str);
-#endif
 
 #endif