diff --git a/dap-sdk/core/src/dap_common.c b/dap-sdk/core/src/dap_common.c index 0ca421272c00cdf2aa687a21d61e4d44f7ea8570..379b3618734f6bd45a8abab5bd7ad43a27770735 100755 --- a/dap-sdk/core/src/dap_common.c +++ b/dap-sdk/core/src/dap_common.c @@ -290,11 +290,8 @@ static void *s_log_thread_proc(void *arg) { (void) arg; for ( ; !s_log_term_signal; ) { pthread_mutex_lock(&s_log_mutex); - for ( ; s_log_count == 0; ) { + for ( ; s_log_count == 0 && !s_log_term_signal; ) { pthread_cond_wait(&s_log_cond, &s_log_mutex); - if (s_log_term_signal) { - break; - } } if (s_log_count) { log_str_t *elem, *tmp; diff --git a/modules/net/dap_chain_net.c b/modules/net/dap_chain_net.c index 7ed6ac5e6ca03ac0f2bb8faf943a44a9dcc76874..427e30be8e3912d25e316080f3848a4c8a21d491 100644 --- a/modules/net/dap_chain_net.c +++ b/modules/net/dap_chain_net.c @@ -724,7 +724,7 @@ static int s_net_states_proc(dap_chain_net_t * l_net) } break; default: - log_it(L_INFO, "sync of chain '%s' error %d", l_chain->name,l_res); + log_it(L_ERROR, "sync of chain '%s' error %d", l_chain->name,l_res); } if (l_res) { l_sync_errors++; @@ -758,7 +758,6 @@ static int s_net_states_proc(dap_chain_net_t * l_net) case NET_STATE_ONLINE: case NET_STATE_SYNC_GDB: case NET_STATE_SYNC_CHAINS: - // if flag set then go to SYNC_GDB l_pvt_net->state = NET_STATE_LINKS_CONNECTING; break; default: break; @@ -803,7 +802,7 @@ static void *s_net_proc_thread ( void *a_net ) // check or start sync s_net_states_proc( l_net ); - if (F_DAP_CHAIN_NET_GO_SYNC) { + if (p_net->flags & F_DAP_CHAIN_NET_GO_SYNC) { continue; } struct timespec l_to;