Made DNS server start earlier. Made Windows service more robust.
This commit is contained in:
+6
-6
@@ -297,6 +297,12 @@ fn load_keys(settings: &Settings) -> Vec<Keystore> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn start_services(settings: &Settings, context: &Arc<Mutex<Context>>) -> (bool, Arc<Mutex<Miner>>, JoinHandle<()>) {
|
pub fn start_services(settings: &Settings, context: &Arc<Mutex<Context>>) -> (bool, Arc<Mutex<Miner>>, JoinHandle<()>) {
|
||||||
|
let dns_server_ok = if settings.dns.threads > 0 {
|
||||||
|
dns_utils::start_dns_server(&context, &settings)
|
||||||
|
} else {
|
||||||
|
true
|
||||||
|
};
|
||||||
|
|
||||||
if let Ok(mut context) = context.lock() {
|
if let Ok(mut context) = context.lock() {
|
||||||
context.chain.check_chain(settings.check_blocks);
|
context.chain.check_chain(settings.check_blocks);
|
||||||
match context.chain.get_block(1) {
|
match context.chain.get_block(1) {
|
||||||
@@ -309,12 +315,6 @@ pub fn start_services(settings: &Settings, context: &Arc<Mutex<Context>>) -> (bo
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let dns_server_ok = if settings.dns.threads > 0 {
|
|
||||||
dns_utils::start_dns_server(&context, &settings)
|
|
||||||
} else {
|
|
||||||
true
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut miner_obj = Miner::new(Arc::clone(&context));
|
let mut miner_obj = Miner::new(Arc::clone(&context));
|
||||||
miner_obj.start_mining_thread();
|
miner_obj.start_mining_thread();
|
||||||
let miner: Arc<Mutex<Miner>> = Arc::new(Mutex::new(miner_obj));
|
let miner: Arc<Mutex<Miner>> = Arc::new(Mutex::new(miner_obj));
|
||||||
|
|||||||
+1
-1
@@ -85,7 +85,7 @@ fn run_service_logic() -> Result<()> {
|
|||||||
let (_dns_server_ok, _miner, _network) = start_services(&settings, &context);
|
let (_dns_server_ok, _miner, _network) = start_services(&settings, &context);
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
thread::sleep(Duration::from_secs(1));
|
thread::sleep(Duration::from_millis(50));
|
||||||
// Poll shutdown event.
|
// Poll shutdown event.
|
||||||
match shutdown_rx.recv_timeout(Duration::from_secs(1)) {
|
match shutdown_rx.recv_timeout(Duration::from_secs(1)) {
|
||||||
// Break the loop either upon stop or channel disconnect
|
// Break the loop either upon stop or channel disconnect
|
||||||
|
|||||||
Reference in New Issue
Block a user