From: Jeroen van der Heijden Date: Fri, 24 Jan 2020 13:50:02 +0000 (+0100) Subject: Update socket X-Git-Tag: archive/raspbian/2.0.44-1+rpi1~1^2~3^2~5^2~16 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e1c5f11cefabdeafc5da4d7d638b21b32db85fda;p=siridb-server.git Update socket --- diff --git a/src/siri/db/db.c b/src/siri/db/db.c index 2b94f668..a51c7559 100644 --- a/src/siri/db/db.c +++ b/src/siri/db/db.c @@ -273,7 +273,7 @@ siridb_t * siridb_new(const char * dbpath, int lock_flags) /* init tee if configured */ if (siridb_tee_is_configured(siridb->tee)) { - // siridb_tee_connect(siridb->tee); + siridb_tee_connect(siridb->tee); } log_info("Finished loading database: '%s'", siridb->dbname); diff --git a/src/siri/db/tee.c b/src/siri/db/tee.c index 5eafa84d..47d04269 100644 --- a/src/siri/db/tee.c +++ b/src/siri/db/tee.c @@ -145,10 +145,10 @@ static void tee__runtime_init(uv_pipe_t * pipe) tee->flags &= ~SIRIDB_TEE_FLAG_INIT; tee->flags &= ~SIRIDB_TEE_FLAG_CONNECTED; - // if (siridb_tee_connect(tee)) - // { - // log_error("Could not connect to tee at runtime"); - // } + if (siridb_tee_connect(tee)) + { + log_error("Could not connect to tee at runtime"); + } } static void tee__close_cb(uv_pipe_t * pipe) diff --git a/src/siri/heartbeat.c b/src/siri/heartbeat.c index 0815950e..200740ce 100644 --- a/src/siri/heartbeat.c +++ b/src/siri/heartbeat.c @@ -64,7 +64,7 @@ static void HEARTBEAT_cb(uv_timer_t * handle __attribute__((unused))) if ( siridb_tee_is_configured(siridb->tee) && !siridb_tee_is_connected(siridb->tee)) { - // siridb_tee_connect(siridb->tee); + siridb_tee_connect(siridb->tee); } server_node = siridb->servers->first; diff --git a/src/siri/siri.c b/src/siri/siri.c index 8630d2a2..242d8ea3 100644 --- a/src/siri/siri.c +++ b/src/siri/siri.c @@ -216,8 +216,6 @@ int siri_start(void) /* start the event loop */ uv_run(siri.loop, UV_RUN_DEFAULT); - LOGC("EXIT..."); - /* quit, don't forget to run siri_free() (should be done in main) */ return 0; } @@ -495,7 +493,6 @@ static void SIRI_walk_close_handlers( { if (uv_is_closing(handle)) { - LOGC("Handle is closing..."); return; } @@ -509,7 +506,6 @@ static void SIRI_walk_close_handlers( case UV_TCP: case UV_NAMED_PIPE: { - LOGC("Found SOCKET..."); if (handle->data == NULL || siridb_tee_is_handle(handle)) { uv_close(handle, NULL);