X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=afs.c;h=c2ac0e4110e15ceac8f677947894e2a1afd057b4;hb=d4776878609698ca63c99c3db711ae3edf038bba;hp=950b404ed643d23b20400d3a4ebea523319ca20b;hpb=1049b080cc7e5f4fafe8af9731fc5cce0e490369;p=paraslash.git

diff --git a/afs.c b/afs.c
index 950b404e..c2ac0e41 100644
--- a/afs.c
+++ b/afs.c
@@ -460,7 +460,7 @@ static int pass_afd(int fd, char *buf, size_t size)
 
 	/* Sum of the length of all control messages in the buffer */
 	msg.msg_controllen = cmsg->cmsg_len;
-	PARA_NOTICE_LOG("passing %zu bytes and fd %d\n", size, fd);
+	PARA_DEBUG_LOG("passing %zu bytes and fd %d\n", size, fd);
 	ret = sendmsg(server_socket, &msg, 0);
 	if (ret < 0) {
 		ret = -ERRNO_TO_PARA_ERROR(errno);
@@ -487,7 +487,7 @@ int open_next_audio_file(void)
 	int ret, shmid;
 	char buf[8];
 
-	PARA_NOTICE_LOG("getting next af\n");
+	PARA_NOTICE_LOG("getting next audio file\n");
 	ret = score_get_best(&aft_row, &afd.score);
 	if (ret < 0)
 		return ret;
@@ -495,7 +495,6 @@ int open_next_audio_file(void)
 	if (ret < 0)
 		return ret;
 	shmid = ret;
-	PARA_NOTICE_LOG("shmid: %u\n", shmid);
 	if (!write_ok(server_socket)) {
 		PARA_EMERG_LOG("afs_socket not writable\n");
 		goto destroy;
@@ -672,6 +671,8 @@ static int open_afs_tables(void)
 	int i, ret;
 
 	get_database_dir();
+	PARA_NOTICE_LOG("opening %u osl tables in %s\n", NUM_AFS_TABLES,
+		database_dir);
 	for (i = 0; i < NUM_AFS_TABLES; i++) {
 		ret = afs_tables[i].open(database_dir);
 		if (ret >= 0)
@@ -716,9 +717,9 @@ static void signal_post_select(struct sched *s, struct task *t)
 	if (st->signum == SIGHUP) {
 		close_afs_tables();
 		t->ret = open_afs_tables();
-		/* FIXME: Restore current mood or playlist */
 		if (t->ret < 0)
 			goto err;
+		init_admissible_files(current_mop);
 		return;
 	}
 	t->ret = -E_AFS_SIGNAL;
@@ -830,7 +831,7 @@ static void execute_server_command(void)
 		return;
 	}
 	buf[ret] = '\0';
-	PARA_NOTICE_LOG("received: %s\n", buf);
+	PARA_DEBUG_LOG("received: %s\n", buf);
 	if (!strcmp(buf, "new")) {
 		ret = open_next_audio_file();
 		if (ret < 0)