Skip to content

Commit 775923b

Browse files
JyJyJcrJyJyJcr
committed
fix: revert and cfg out log module
1 parent 7148c7d commit 775923b

File tree

2 files changed

+19
-30
lines changed

2 files changed

+19
-30
lines changed

‎src/lib.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ pub mod http;
5959
/// The log module.
6060
///
6161
/// This module provides an interface into the NGINX logger framework.
62+
///
63+
/// This module is temporally available only with `std` feature.
64+
#[cfg(feature = "std")]
6265
pub mod log;
6366

6467
/// Define modules exported by this library.

‎src/log.rs‎

Lines changed: 16 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,18 @@ pub fn check_mask(mask: DebugMask, log_level: usize) -> bool {
88
true
99
}
1010

11-
#[cfg(all(not(feature = "std"), feature = "alloc"))]
12-
#[doc(hidden)]
13-
pub mod __log_macro_extern {
14-
pub use alloc::ffi::CString;
15-
}
16-
#[cfg(feature = "std")]
17-
#[doc(hidden)]
18-
pub mod __log_macro_extern {
19-
pub use std::ffi::CString;
20-
}
21-
2211
/// Write to logger at a specified level.
2312
///
2413
/// See [Logging](https://nginx.org/en/docs/dev/development_guide.html#logging)
2514
/// for available log levels.
2615
#[macro_export]
27-
#[cfg(feature = "alloc")]
2816
macro_rules! ngx_log_debug {
2917
( $log:expr, $($arg:tt)* ) => {
3018
let log_level = unsafe { (*$log).log_level };
3119
if log_level != 0 {
3220
let level = $crate::ffi::NGX_LOG_DEBUG as $crate::ffi::ngx_uint_t;
33-
let fmt = $crate::log::__log_macro_extern::CString::new("%s").unwrap();
34-
let c_message = $crate::log::__log_macro_extern::CString::new(format!($($arg)*)).unwrap();
21+
let fmt = ::std::ffi::CString::new("%s").unwrap();
22+
let c_message = ::std::ffi::CString::new(format!($($arg)*)).unwrap();
3523
unsafe {
3624
$crate::ffi::ngx_log_error_core(level, $log, 0, fmt.as_ptr(), c_message.as_ptr());
3725
}
@@ -43,7 +31,6 @@ macro_rules! ngx_log_debug {
4331
///
4432
/// [`NGX_LOG_DEBUG_HTTP`]: https://nginx.org/en/docs/dev/development_guide.html#logging
4533
#[macro_export]
46-
#[cfg(feature = "alloc")]
4734
macro_rules! ngx_log_debug_http {
4835
( $request:expr, $($arg:tt)* ) => {
4936
let log = unsafe { (*$request.connection()).log };
@@ -60,14 +47,13 @@ macro_rules! ngx_log_debug_http {
6047
/// See <https://nginx.org/en/docs/dev/development_guide.html#logging> for details and available
6148
/// masks.
6249
#[macro_export]
63-
#[cfg(feature = "alloc")]
6450
macro_rules! ngx_log_debug_mask {
6551
( DebugMask::Core, $log:expr, $($arg:tt)* ) => ({
6652
let log_level = unsafe { (*$log).log_level };
6753
if $crate::log::check_mask(DebugMask::Core, log_level) {
6854
let level = $crate::ffi::NGX_LOG_DEBUG as $crate::ffi::ngx_uint_t;
69-
let fmt = $crate::log::__log_macro_extern::CString::new("%s").unwrap();
70-
let c_message = $crate::log::__log_macro_extern::CString::new(format!($($arg)*)).unwrap();
55+
let fmt = ::std::ffi::CString::new("%s").unwrap();
56+
let c_message = ::std::ffi::CString::new(format!($($arg)*)).unwrap();
7157
unsafe {
7258
$crate::ffi::ngx_log_error_core(level, $log, 0, fmt.as_ptr(), c_message.as_ptr());
7359
}
@@ -77,8 +63,8 @@ macro_rules! ngx_log_debug_mask {
7763
let log_level = unsafe { (*$log).log_level };
7864
if $crate::log::check_mask(DebugMask::Alloc, log_level) {
7965
let level = $crate::ffi::NGX_LOG_DEBUG as $crate::ffi::ngx_uint_t;
80-
let fmt = $crate::log::__log_macro_extern::CString::new("%s").unwrap();
81-
let c_message = $crate::log::__log_macro_extern::CString::new(format!($($arg)*)).unwrap();
66+
let fmt = ::std::ffi::CString::new("%s").unwrap();
67+
let c_message = ::std::ffi::CString::new(format!($($arg)*)).unwrap();
8268
unsafe {
8369
$crate::ffi::ngx_log_error_core(level, $log, 0, fmt.as_ptr(), c_message.as_ptr());
8470
}
@@ -88,8 +74,8 @@ macro_rules! ngx_log_debug_mask {
8874
let log_level = unsafe { (*$log).log_level };
8975
if $crate::log::check_mask(DebugMask::Mutex, log_level) {
9076
let level = $crate::ffi::NGX_LOG_DEBUG as $crate::ffi::ngx_uint_t;
91-
let fmt = $crate::log::__log_macro_extern::CString::new("%s").unwrap();
92-
let c_message = $crate::log::__log_macro_extern::CString::new(format!($($arg)*)).unwrap();
77+
let fmt = ::std::ffi::CString::new("%s").unwrap();
78+
let c_message = ::std::ffi::CString::new(format!($($arg)*)).unwrap();
9379
unsafe {
9480
$crate::ffi::ngx_log_error_core(level, $log, 0, fmt.as_ptr(), c_message.as_ptr());
9581
}
@@ -99,8 +85,8 @@ macro_rules! ngx_log_debug_mask {
9985
let log_level = unsafe { (*$log).log_level };
10086
if $crate::log::check_mask(DebugMask::Event, log_level) {
10187
let level = $crate::ffi::NGX_LOG_DEBUG as $crate::ffi::ngx_uint_t;
102-
let fmt = $crate::log::__log_macro_extern::CString::new("%s").unwrap();
103-
let c_message = $crate::log::__log_macro_extern::CString::new(format!($($arg)*)).unwrap();
88+
let fmt = ::std::ffi::CString::new("%s").unwrap();
89+
let c_message = ::std::ffi::CString::new(format!($($arg)*)).unwrap();
10490
unsafe {
10591
$crate::ffi::ngx_log_error_core(level, $log, 0, fmt.as_ptr(), c_message.as_ptr());
10692
}
@@ -110,8 +96,8 @@ macro_rules! ngx_log_debug_mask {
11096
let log_level = unsafe { (*$log).log_level };
11197
if $crate::log::check_mask(DebugMask::Http, log_level) {
11298
let level = $crate::ffi::NGX_LOG_DEBUG as $crate::ffi::ngx_uint_t;
113-
let fmt = $crate::log::__log_macro_extern::CString::new("%s").unwrap();
114-
let c_message = $crate::log::__log_macro_extern::CString::new(format!($($arg)*)).unwrap();
99+
let fmt = ::std::ffi::CString::new("%s").unwrap();
100+
let c_message = ::std::ffi::CString::new(format!($($arg)*)).unwrap();
115101
unsafe {
116102
$crate::ffi::ngx_log_error_core(level, $log, 0, fmt.as_ptr(), c_message.as_ptr());
117103
}
@@ -121,8 +107,8 @@ macro_rules! ngx_log_debug_mask {
121107
let log_level = unsafe { (*$log).log_level };
122108
if $crate::log::check_mask(DebugMask::Mail, log_level) {
123109
let level = $crate::ffi::NGX_LOG_DEBUG as $crate::ffi::ngx_uint_t;
124-
let fmt = $crate::log::__log_macro_extern::CString::new("%s").unwrap();
125-
let c_message = $crate::log::__log_macro_extern::CString::new(format!($($arg)*)).unwrap();
110+
let fmt = ::std::ffi::CString::new("%s").unwrap();
111+
let c_message = ::std::ffi::CString::new(format!($($arg)*)).unwrap();
126112
unsafe {
127113
$crate::ffi::ngx_log_error_core(level, $log, 0, fmt.as_ptr(), c_message.as_ptr());
128114
}
@@ -132,8 +118,8 @@ macro_rules! ngx_log_debug_mask {
132118
let log_level = unsafe { (*$log).log_level };
133119
if $crate::log::check_mask(DebugMask::Stream, log_level) {
134120
let level = $crate::ffi::NGX_LOG_DEBUG as $crate::ffi::ngx_uint_t;
135-
let fmt = $crate::log::__log_macro_extern::CString::new("%s").unwrap();
136-
let c_message = $crate::log::__log_macro_extern::CString::new(format!($($arg)*)).unwrap();
121+
let fmt = ::std::ffi::CString::new("%s").unwrap();
122+
let c_message = ::std::ffi::CString::new(format!($($arg)*)).unwrap();
137123
unsafe {
138124
$crate::ffi::ngx_log_error_core(level, $log, 0, fmt.as_ptr(), c_message.as_ptr());
139125
}

0 commit comments

Comments
 (0)