Remove logger

4 files changed, 19 insertions, 124 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 30333d1..5d39327 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -88,10 +88,8 @@ name = "clawflake"
 version = "0.1.0"
 dependencies = [
  "chrono",
- "log",
  "parking_lot",
  "prost",
- "serde_json",
  "tokio",
  "tonic",
  "tonic-build",
@@ -623,35 +621,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "ryu"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
-
-[[package]]
 name = "scopeguard"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
-name = "serde"
-version = "1.0.126"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
-
-[[package]]
-name = "serde_json"
-version = "1.0.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
 name = "slab"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index ff2c2e7..fc0bc98 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,8 +13,6 @@ path = "src/client.rs"
 
 [dependencies]
 chrono = "0.4.19"
-log = "0.4.14"
-serde_json = "1.0.66"
 parking_lot = "0.11.1"
 tonic = "0.5"
 tonic-health = "0.4.0"
diff --git a/src/logger.rs b/src/logger.rs
deleted file mode 100644
index 4ca417d..0000000
--- a/src/logger.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-use chrono::prelude::*;
-use log::{Level, Log, Metadata, Record, SetLoggerError};
-use serde_json::json;
-
-pub struct Logger;
-
-impl Log for Logger {
-    fn enabled(&self, metadata: &Metadata) -> bool {
-        metadata.level() <= Level::Info
-    }
-
-    fn log(&self, record: &Record) {
-        let file: &str = record.file().unwrap_or("");
-        let line: i32 = record.line().map_or(-1, |v| v as i32);
-        let module_path: &str = record.module_path().unwrap_or("");
-        let ts: String = Utc::now().to_string();
-
-        match record.level() {
-            Level::Error => {
-                println!(
-                    "{}",
-                    json!({
-                      "ts": ts,
-                      "file": file,
-                      "line": line,
-                      "module_path": module_path,
-                      "msg": record.args().to_string(),
-                      "level": "error"
-                    })
-                    .to_string()
-                )
-            }
-            Level::Warn => {
-                println!(
-                    "{}",
-                    json!({
-                      "ts": ts,
-                      "file": file,
-                      "line": line,
-                      "module_path": module_path,
-                      "msg": record.args().to_string(),
-                      "level": "warn"
-                    })
-                    .to_string()
-                )
-            }
-            Level::Info => {
-                println!(
-                    "{}",
-                    json!({
-                      "ts": ts,
-                      "file": file,
-                      "line": line,
-                      "module_path": module_path,
-                      "msg": record.args().to_string(),
-                      "level": "info"
-                    })
-                    .to_string()
-                )
-            }
-            Level::Debug => {}
-            Level::Trace => {}
-        }
-    }
-
-    fn flush(&self) {}
-}
-
-static _LOGGER: Logger = Logger;
-
-pub fn init() -> Result<(), SetLoggerError> {
-    log::set_logger(&_LOGGER)
-}
diff --git a/src/server.rs b/src/server.rs
index c65ebb9..465026b 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -1,13 +1,10 @@
 use std::env;
 use std::net::SocketAddr;
-use std::process::exit;
 
-use log::info;
-mod logger;
 use tonic::{transport::Server, Request, Response, Status};
 
 pub mod clawflake {
-  tonic::include_proto!("clawflake");
+    tonic::include_proto!("clawflake");
 }
 
 use clawflake::clawflake_server::{Clawflake, ClawflakeServer};
@@ -17,21 +14,26 @@ mod id_worker;
 use id_worker::IdWorker;
 
 #[derive(Debug, Default)]
-pub struct MyClawflakeService {
-}
+pub struct MyClawflakeService {}
 
 #[tonic::async_trait]
 impl Clawflake for MyClawflakeService {
-    async fn get_id(
-        &self,
-        _: Request<IdRequest>,
-    ) -> Result<Response<IdReply>, Status> {
-        info!("request on GetID");
+    async fn get_id(&self, request: Request<IdRequest>) -> Result<Response<IdReply>, Status> {
+        eprintln!("{:?}", &request);
 
         let mut worker: IdWorker = IdWorker::new(
-          env::var("CLAWFLAKE_EPOCH").expect("Missing env `CLAWFLAKE_EPOCH`").parse::<i64>().unwrap(), 
-          env::var("CLAWFLAKE_WORKER_ID").expect("Missing env `CLAWFLAKE_WORKER_ID`").parse::<i64>().unwrap(),
-          env::var("CLAWFLAKE_DATACENTER_ID").expect("Missing env `CLAWFLAKE_DATACENTER_ID`").parse::<i64>().unwrap()
+            env::var("CLAWFLAKE_EPOCH")
+                .expect("Missing env `CLAWFLAKE_EPOCH`")
+                .parse::<i64>()
+                .unwrap(),
+            env::var("CLAWFLAKE_WORKER_ID")
+                .expect("Missing env `CLAWFLAKE_WORKER_ID`")
+                .parse::<i64>()
+                .unwrap(),
+            env::var("CLAWFLAKE_DATACENTER_ID")
+                .expect("Missing env `CLAWFLAKE_DATACENTER_ID`")
+                .parse::<i64>()
+                .unwrap(),
         );
 
         let reply: IdReply = clawflake::IdReply {
@@ -44,18 +46,11 @@ impl Clawflake for MyClawflakeService {
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // init logger
-    match logger::init() {
-      Err(e) => {
-        eprintln!("failed to init logger: {}", &e);
-        exit(1);
-      }
-      _ => {}
-    }
-
     // init tonic_health
     let (mut health_reporter, health_service) = tonic_health::server::health_reporter();
-    health_reporter.set_serving::<ClawflakeServer<MyClawflakeService>>().await;
+    health_reporter
+        .set_serving::<ClawflakeServer<MyClawflakeService>>()
+        .await;
 
     // init tonic and IdWorker
     let addr: SocketAddr = "[::0]:50051".parse()?;