implement log macro

kfatyuip · Aug 4, 2024 · cadc9ab · cadc9ab
1 parent 292d114
commit cadc9ab
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 39 deletions.
diff --git a/docs/HOTRELOAD.md b/docs/HOTRELOAD.md
@@ -7,5 +7,3 @@ $ kill -SIGHUP $(pidof zest)
 ```
 
 or using the script in scripts/ directory,
-
-and after a socket request (chose it for better performance), it will be reloaded
diff --git a/scripts/hotreload.sh b/scripts/hotreload.sh
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,3 +1,6 @@
+#[macro_use]
+pub mod macros;
+
 pub mod config;
 pub mod init;
 pub mod route;

diff --git a/src/macros.rs b/src/macros.rs
@@ -0,0 +1,68 @@
+#[cfg(feature = "log")]
+#[macro_export]
+macro_rules! info {
+    ($fmt:expr) => {
+        logger().log(
+            &log::Record::builder()
+                .level(log::Level::Info)
+                .target("access")
+                .args(format_args!($fmt))
+                .build(),
+        );
+    };
+    ($fmt:expr, $($args:tt)*) => {
+        logger().log(
+            &log::Record::builder()
+                .level(log::Level::Info)
+                .target("access")
+                .args(format_args!($fmt, $($args)*))
+                .build(),
+        );
+    };
+}
+
+#[cfg(feature = "log")]
+#[macro_export]
+macro_rules! error {
+    ($fmt:expr) => {
+        logger().log(
+            &log::Record::builder()
+                .level(log::Level::Error)
+                .target("error")
+                .args(format_args!($fmt))
+                .build(),
+        );
+    };
+    ($fmt:expr, $($args:tt)*) => {
+        logger().log(
+            &log::Record::builder()
+                .level(log::Level::Error)
+                .target("error")
+                .args(format_args!($fmt, $($args)*))
+                .build(),
+        );
+    };
+}
+
+#[cfg(feature = "log")]
+#[macro_export]
+macro_rules! warn {
+    ($fmt:expr) => {
+        logger().log(
+            &log::Record::builder()
+                .level(log::Level::Warn)
+                .target("access")
+                .args(format_args!($fmt))
+                .build(),
+        );
+    };
+    ($fmt:expr, $($args:tt)*) => {
+        logger().log(
+            &log::Record::builder()
+                .level(log::Level::Warn)
+                .target("access")
+                .args(format_args!($fmt, $($args)*))
+                .build(),
+        );
+    };
+}
diff --git a/src/zest.rs b/src/zest.rs
@@ -281,13 +281,8 @@ where
     'handle: loop {
         if T.try_read().unwrap().is_none() {
             #[cfg(feature = "log")]
-            logger().log(
-                &log::Record::builder()
-                    .level(log::Level::Info)
-                    .target("access")
-                    .args(format_args!("config reloaded!"))
-                    .build(),
-            );
+            info!("config reloaded!");
+
             return Ok(());
         }
 
@@ -340,40 +335,13 @@ where
                     {
                         match _status_code {
                             200 => {
-                                logger().log(
-                                    &log::Record::builder()
-                                        .level(log::Level::Info)
-                                        .target("access")
-                                        .args(format_args!(
-                                            "\"{}\" {} - {}",
-                                            _req, _status_code, _addr
-                                        ))
-                                        .build(),
-                                );
+                                info!("\"{}\" {} - {}", _req, _status_code, _addr);
                             }
                             400.. => {
-                                logger().log(
-                                    &log::Record::builder()
-                                        .level(log::Level::Error)
-                                        .target("error")
-                                        .args(format_args!(
-                                            "\"{}\" {} - {}",
-                                            _req, _status_code, _addr
-                                        ))
-                                        .build(),
-                                );
+                                error!("\"{}\" {} - {}", _req, _status_code, _addr);
                             }
                             _ => {
-                                logger().log(
-                                    &log::Record::builder()
-                                        .level(log::Level::Warn)
-                                        .target("access")
-                                        .args(format_args!(
-                                            "\"{}\" {} - {}",
-                                            _req, _status_code, _addr
-                                        ))
-                                        .build(),
-                                );
+                                warn!("\"{}\" {} - {}", _req, _status_code, _addr);
                             }
                         };
                     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,5 +7,3 @@ $ kill -SIGHUP $(pidof zest)
		```

		or using the script in scripts/ directory,

		and after a socket request (chose it for better performance), it will be reloaded