various bug fixes

2 files changed, 55 insertions, 30 deletions

diff --git a/accel-pptpd/logs/log_file.c b/accel-pptpd/logs/log_file.c
index b39c623..c364fbd 100644
--- a/accel-pptpd/logs/log_file.c
+++ b/accel-pptpd/logs/log_file.c
@@ -109,12 +109,22 @@ static void sigio(int num, siginfo_t *si, void *uc)
 
 	spin_lock(&lf->lock);
 	lf->offset += n;
-	if (list_empty(&lf->msgs) && lf->need_free) {
-		spin_unlock(&lf->lock);
-		close(lf->fd);
-		mempool_free(lf->lpd);
-	} else
+	if (list_empty(&lf->msgs)) {
+		if (lf->need_free) {
+			spin_unlock(&lf->lock);
+			close(lf->fd);
+			mempool_free(lf->lpd);
+		} else {
+			lf->queued = 0;
+			spin_unlock(&lf->lock);
+		}
+	} else {
 		spin_unlock(&lf->lock);
+
+		spin_lock(&lf_queue_lock);
+		list_add_tail(&lf->entry, &lf_queue);
+		spin_unlock(&lf_queue_lock);
+	}
 	
 	send_next_chunk();
 }
@@ -128,7 +138,6 @@ static int dequeue_log(struct log_file_t *lf)
 	while (1) {
 		spin_lock(&lf->lock);
 		if (list_empty(&lf->msgs)) {
-			lf->queued = 0;
 			spin_unlock(&lf->lock);
 			return pos;
 		}
@@ -157,10 +166,6 @@ overrun:
 	list_add(&msg->entry, &lf->msgs);
 	spin_unlock(&lf->lock);
 
-	spin_lock(&lf_queue_lock);
-	list_add_tail(&lf->entry, &lf_queue);
-	spin_unlock(&lf_queue_lock);
-
 	return pos;
 }
 
@@ -317,6 +322,7 @@ static void free_lpd(struct log_file_pd_t *lpd)
 		}
 		if (lpd->lf.fd != -1)
 			close(lpd->lf.fd);
+		list_del(&lpd->pd.entry);
 		spin_unlock(&lpd->lf.lock);
 		mempool_free(lpd);
 	}
diff --git a/accel-pptpd/logs/log_pgsql.c b/accel-pptpd/logs/log_pgsql.c
index 393c3bd..351fc06 100644
--- a/accel-pptpd/logs/log_pgsql.c
+++ b/accel-pptpd/logs/log_pgsql.c
@@ -74,31 +74,40 @@ static void write_next_msg(void)
 	const char *paramValues[4];
 	int paramFormats[4] = {0, 0, 0, 0};
 	char *ptr1, *ptr2;
+	int r;
 
 	spin_lock(&queue_lock);
-	if (!list_empty(&msg_queue)) {
-		msg = list_entry(msg_queue.next, typeof(*msg), entry);
-		list_del(&msg->entry);
-		--queue_size;
+	if (list_empty(&msg_queue)) {
+		sleeping = 1;
 		spin_unlock(&queue_lock);
+		return;
+	}
 
-		unpack_msg(msg);
+	msg = list_entry(msg_queue.next, typeof(*msg), entry);
+	list_del(&msg->entry);
+	--queue_size;
+	spin_unlock(&queue_lock);
 
-		ptr1 = strchr(msg->hdr->msg, 0);
-		ptr2 = strchr(ptr1 + 1, 0);
+	unpack_msg(msg);
 
-		paramValues[1] = ptr1[1] ? ptr1 + 1 : NULL;
-		paramValues[2] = ptr2[1] ? ptr2 + 1 : NULL;
-		paramValues[0] = msg->hdr->msg;
-		paramValues[3] = log_buf;
+	ptr1 = strchr(msg->hdr->msg, 0);
+	ptr2 = strchr(ptr1 + 1, 0);
 
-		PQsendQueryParams(conn, conf_query, 4, NULL, paramValues, NULL, paramFormats, 0);
-		PQflush(conn);
-		log_free_msg(msg);
-		return;
-	}
-	sleeping = 1;
-	spin_unlock(&queue_lock);
+	paramValues[1] = ptr1[1] ? ptr1 + 1 : NULL;
+	paramValues[2] = ptr2[1] ? ptr2 + 1 : NULL;
+	paramValues[0] = msg->hdr->msg;
+	paramValues[3] = log_buf;
+
+	if (!PQsendQueryParams(conn, conf_query, 4, NULL, paramValues, NULL, paramFormats, 0))
+		log_emerg("log_pgsql: %s\n", PQerrorMessage(conn));
+
+	log_free_msg(msg);
+
+	r = PQflush(conn);
+	if (r == -1)
+		log_emerg("log_pgsql: %s\n", PQerrorMessage(conn));
+	if (r == 0)
+		triton_md_enable_handler(&pgsql_hnd, MD_MODE_WRITE);
 }
 
 static int pgsql_check_ready(struct triton_md_handler_t *h)
@@ -132,7 +141,15 @@ static int pgsql_check_ready(struct triton_md_handler_t *h)
 
 static int pgsql_flush(struct triton_md_handler_t *h)
 {
-	PQflush(conn);
+	int r;
+
+	r = PQflush(conn);
+	if (r == -1)
+		log_emerg("log_pgsql: %s\n", PQerrorMessage(conn));
+	if (r == 1)
+		return 0;
+	
+	triton_md_disable_handler(&pgsql_hnd, MD_MODE_WRITE);
 	return 0;
 }
 
@@ -196,7 +213,7 @@ static int wait_connect(struct triton_md_handler_t *h)
 			PQsetnonblocking(conn, 1);
 			h->write = pgsql_flush;
 			h->read = pgsql_check_ready;
-			triton_md_enable_handler(&pgsql_hnd, MD_MODE_READ | MD_MODE_WRITE);
+			triton_md_enable_handler(&pgsql_hnd, MD_MODE_READ);
 			wakeup_log();
 			break;
 		default:
@@ -266,6 +283,8 @@ static void __init init(void)
 
 	triton_context_register(&pgsql_ctx, NULL);
 	triton_md_register_handler(&pgsql_ctx, &pgsql_hnd);
+	triton_md_set_trig(&pgsql_hnd, MD_TRIG_LEVEL);
+	triton_context_wakeup(&pgsql_ctx);
 
 	start_connect();