Merge logger handle to state.

Author: autozimu

Cargo.lock

@@ -11,7 +11,6 @@ log = "0.4"
 log4rs = "0"
 structopt = "0"
 libc = "0"
-lazy_static = "1"
 chrono = { version = "0", features = ["serde"] }
 maplit = "1"
 

Cargo.toml

@@ -49,8 +49,7 @@ impl State {
 
     fn sync_settings(&mut self) -> Result<()> {
         let loggingLevel: String = self.eval("get(g:, 'LanguageClient_loggingLevel', 'WARN')")?;
-        let logger = LOGGER.as_ref().map_err(|e| format_err!("{:?}", e))?;
-        logger::set_logging_level(logger, &loggingLevel)?;
+        logger::set_logging_level(&self.logger, &loggingLevel)?;
 
         #[allow(unknown_lints)]
         #[allow(type_complexity)]
@@ -1797,8 +1796,7 @@ impl State {
     pub fn languageClient_setLoggingLevel(&mut self, params: &Option<Params>) -> Result<Value> {
         info!("Begin {}", REQUEST__SetLoggingLevel);
         let (loggingLevel,): (String,) = self.gather_args(&["loggingLevel"], params)?;
-        let logger = LOGGER.as_ref().map_err(|e| format_err!("{:?}", e))?;
-        logger::set_logging_level(logger, &loggingLevel)?;
+        logger::set_logging_level(&self.logger, &loggingLevel)?;
         info!("End {}", REQUEST__SetLoggingLevel);
         Ok(Value::Null)
     }

src/languageclient.rs

@@ -66,9 +66,6 @@ extern crate notify;
 extern crate structopt;
 use structopt::StructOpt;
 
-#[macro_use]
-extern crate lazy_static;
-
 mod types;
 use types::*;
 mod utils;
@@ -84,12 +81,8 @@ mod logger;
 #[derive(Debug, StructOpt)]
 struct Opt {}
 
-lazy_static! {
-    pub static ref LOGGER: Result<log4rs::Handle> = logger::init();
-}
-
 fn run() -> Result<()> {
-    let mut state = State::new();
+    let mut state = State::new()?;
 
     let tx = state.tx.clone();
     let reader_thread_name: String = "reader-main".into();
@@ -112,9 +105,6 @@ fn main() {
     let app = Opt::clap().version(version.as_str());
     let _ = app.get_matches();
 
-    let logger = LOGGER.as_ref().map_err(|e| format_err!("{:?}", e)).unwrap();
-    logger::set_logging_level(logger, "info").unwrap();
-
     if let Err(err) = run() {
         eprintln!("{:?}", err);
     }

src/main.rs

@@ -72,7 +72,7 @@ pub enum Call {
     Notification(Option<String>, rpc::Notification),
 }
 
-#[derive(Debug, Serialize)]
+#[derive(Serialize)]
 pub struct State {
     // Program state.
     pub id: Id,
@@ -122,10 +122,13 @@ pub struct State {
     pub rootMarkers: Option<RootMarkers>,
     #[serde(skip_serializing)]
     pub change_throttle: Option<Duration>,
+
+    #[serde(skip_serializing)]
+    pub logger: log4rs::Handle,
 }
 
 impl State {
-    pub fn new() -> State {
+    pub fn new() -> Result<State> {
         // TODO: move this into LanguageClientStart.
         let (watcher_tx, watcher_rx) = channel();
         // TODO: duration configurable.
@@ -139,7 +142,9 @@ impl State {
 
         let (tx, rx) = channel();
 
-        State {
+        let logger = logger::init()?;
+
+        Ok(State {
             id: 0,
             tx,
             rx,
@@ -158,7 +163,7 @@ impl State {
             signs: HashMap::new(),
             highlight_source: None,
             user_handlers: HashMap::new(),
-            watcher_rx: watcher_rx,
+            watcher_rx,
             watcher,
 
             is_nvim: false,
@@ -178,13 +183,9 @@ impl State {
             loadSettings: false,
             rootMarkers: None,
             change_throttle: None,
-        }
-    }
-}
 
-impl Default for State {
-    fn default() -> Self {
-        Self::new()
+            logger,
+        })
     }
 }