MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-15 08:45:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Stop hang while getting db_Version when rescanning

Browse Source
This commit is contained in:
Ron Pedde 2004-09-19 05:18:17 +00:00
parent 078c1e98e1
commit 2861761d36
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/configfile.c
View File

@ -567,7 +567,7 @@ void config_emit_service_status(WS_CONNINFO *pwsc, void *value, char *arg) {
ws_writefd(pwsc,"<TD><a href=\"config-update.html?action=stopdaap\">Stop DAAP Server</a></TD></TR>"); ws_writefd(pwsc,"<TD><a href=\"config-update.html?action=stopdaap\">Stop DAAP Server</a></TD></TR>");
} }
scanning = db_scanning(); scanning = config.reload;
ws_writefd(pwsc,"<TR><TD>Background scanner</TD><TD>%s</TD>",scanning ? "Running":"Idle"); ws_writefd(pwsc,"<TR><TD>Background scanner</TD><TD>%s</TD>",scanning ? "Running":"Idle");
if(scanning) { if(scanning) {
ws_writefd(pwsc,"<TD>Wait...</TD></TR>"); ws_writefd(pwsc,"<TD>Wait...</TD></TR>");
@ -621,10 +621,12 @@ void config_emit_service_status(WS_CONNINFO *pwsc, void *value, char *arg) {
ws_writefd(pwsc," <TD>%d</TD>\n",config.stats.songs_served); ws_writefd(pwsc," <TD>%d</TD>\n",config.stats.songs_served);
ws_writefd(pwsc,"</TR>\n"); ws_writefd(pwsc,"</TR>\n");
if(!scanning) {
ws_writefd(pwsc,"<TR>\n"); ws_writefd(pwsc,"<TR>\n");
ws_writefd(pwsc," <TH>DB Version</TH>\n"); ws_writefd(pwsc," <TH>DB Version</TH>\n");
ws_writefd(pwsc," <TD>%d</TD>\n",db_version()); ws_writefd(pwsc," <TD>%d</TD>\n",db_version());
ws_writefd(pwsc,"</TR>\n"); ws_writefd(pwsc,"</TR>\n");
}
/* /*
ws_writefd(pwsc,"<TR>\n"); ws_writefd(pwsc,"<TR>\n");

5
src/main.c
View File

@ -719,13 +719,12 @@ int main(int argc, char *argv[]) {
} }
if(config.reload) { if(config.reload) {
config.reload=0; DPRINTF(ERR_LOG,"Rescanning database\n");
DPRINTF(ERR_LOG,"Reloading configuration\n");
if(scan_init(config.mp3dir)) { if(scan_init(config.mp3dir)) {
DPRINTF(ERR_LOG,"Error rescanning... exiting\n"); DPRINTF(ERR_LOG,"Error rescanning... exiting\n");
config.stop=1; config.stop=1;
} }
config.reload=0;
} }
sleep(MAIN_SLEEP_INTERVAL); sleep(MAIN_SLEEP_INTERVAL);