Merged in fixed_panic_hook (pull request #584)

fixed panic hook Approved-by: zhangsoledad <[email protected]> Approved-by: wzf <[email protected]>
citahub · Jan 10, 2018 · 87c6f10 · 87c6f10
2 parents 006e07f + 8fa9cac
commit 87c6f10
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 34 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cita-auth/src/main.rs b/cita-auth/src/main.rs
@@ -61,8 +61,7 @@ use std::sync::mpsc::channel;
 use std::thread;
 use std::time::Duration;
 use std::time::SystemTime;
-use util::{Mutex, RwLock};
-use util::panichandler::set_panic_handler;
+use util::{set_panic_handler, Mutex, RwLock};
 use verify::Verifier;
 
 fn profifer(flag_prof_start: u64, flag_prof_duration: u64) {

diff --git a/cita-chain/main.rs b/cita-chain/main.rs
@@ -57,7 +57,7 @@ use std::time;
 use std::time::Duration;
 use util::datapath::DataPath;
 use util::kvdb::{Database, DatabaseConfig};
-use util::panichandler::set_panic_handler;
+use util::set_panic_handler;
 
 fn main() {
     micro_service_init!("cita-chain", "CITA:chain");

diff --git a/cita-jsonrpc/src/main.rs b/cita-jsonrpc/src/main.rs
@@ -49,8 +49,7 @@ use std::sync::mpsc::{channel, Sender};
 use std::thread;
 use std::time::{Duration, SystemTime};
 use tokio_core::reactor::Core;
-use util::Mutex;
-use util::panichandler::set_panic_handler;
+use util::{set_panic_handler, Mutex};
 use uuid::Uuid;
 use ws_handler::WsFactory;
 

diff --git a/cita-network/src/main.rs b/cita-network/src/main.rs
@@ -60,7 +60,7 @@ use std::sync::mpsc::channel;
 use std::thread;
 use std::time::Duration;
 use synchronizer::Synchronizer;
-use util::panichandler::set_panic_handler;
+use util::set_panic_handler;
 
 fn main() {
     micro_service_init!("cita-network", "CITA:network");

diff --git a/cita-tendermint b/cita-tendermint