MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-11-10 05:59:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use new config framework in main.c

Browse Source
This commit is contained in:
Julien BLACHE
2009-05-05 15:53:36 +02:00
parent c1a2bf6fcf
commit 9fce6d7abd
1 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main.c
View File

@@ -83,7 +83,6 @@
#include "daapd.h" #include "daapd.h"
#include "conffile.h" #include "conffile.h"
#include "conf.h"
#include "err.h" #include "err.h"
#include "misc.h" #include "misc.h"
#include "filescanner.h" #include "filescanner.h"
@@ -303,10 +302,7 @@ signal_cb(int fd, short event, void *arg)
DPRINTF(E_LOG, L_MAIN, "Got SIGHUP\n"); DPRINTF(E_LOG, L_MAIN, "Got SIGHUP\n");
if (!main_exit) if (!main_exit)
{ err_reopen();
conf_reload();
err_reopen();
}
break; break;
} }
} }
@@ -340,7 +336,8 @@ int main(int argc, char *argv[]) {
int foreground; int foreground;
int force_non_root=0; int force_non_root=0;
int skip_initial=1; int skip_initial=1;
char *db_type,*db_parms,*runas, *tmp; cfg_t *lib;
char *runas, *tmp;
int port; int port;
char *servername; char *servername;
char *ffid = NULL; char *ffid = NULL;
@@ -455,7 +452,7 @@ int main(int argc, char *argv[]) {
} }
/* Daemonize and drop privileges */ /* Daemonize and drop privileges */
runas = conf_alloc_string("general", "runas", "nobody"); runas = cfg_getstr(cfg_getsec(cfg, "general"), "uid");
ret = daemonize(foreground, runas, pidfile); ret = daemonize(foreground, runas, pidfile);
if (ret < 0) if (ret < 0)
@@ -465,8 +462,6 @@ int main(int argc, char *argv[]) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
free(runas);
/* Initialize libevent (after forking) */ /* Initialize libevent (after forking) */
evbase_main = event_init(); evbase_main = event_init();
@@ -480,9 +475,7 @@ int main(int argc, char *argv[]) {
} }
/* this will require that the db be readable by the runas user */ /* this will require that the db be readable by the runas user */
db_type = conf_alloc_string("general","db_type","sqlite"); err = db_open(&perr, "sqlite3", "/var/cache/mt-daapd"); /* FIXME */
db_parms = conf_alloc_string("general","db_parms","/var/cache/mt-daapd");
err=db_open(&perr,db_type,db_parms);
if(err) { if(err) {
DPRINTF(E_LOG,L_MAIN|L_DB,"Error opening db: %s\n",perr); DPRINTF(E_LOG,L_MAIN|L_DB,"Error opening db: %s\n",perr);
@@ -491,9 +484,6 @@ int main(int argc, char *argv[]) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
free(db_type);
free(db_parms);
/* Initialize the database before starting */ /* Initialize the database before starting */
DPRINTF(E_LOG,L_MAIN|L_DB,"Initializing database\n"); DPRINTF(E_LOG,L_MAIN|L_DB,"Initializing database\n");
if(db_init(reload)) { if(db_init(reload)) {
@@ -523,7 +513,9 @@ int main(int argc, char *argv[]) {
} }
/* Register mDNS services */ /* Register mDNS services */
servername = conf_get_servername(); lib = cfg_getnsec(cfg, "library", 0);
servername = cfg_getstr(lib, "name");
for (i = 0; i < (sizeof(txtrecord) / sizeof(*txtrecord) - 1); i++) for (i = 0; i < (sizeof(txtrecord) / sizeof(*txtrecord) - 1); i++)
{ {
@@ -550,10 +542,8 @@ int main(int argc, char *argv[]) {
snprintf(txtrecord[5], 128, "iTSh Version=131073"); /* iTunes 6.0.4 */ snprintf(txtrecord[5], 128, "iTSh Version=131073"); /* iTunes 6.0.4 */
snprintf(txtrecord[6], 128, "Version=196610"); /* iTunes 6.0.4 */ snprintf(txtrecord[6], 128, "Version=196610"); /* iTunes 6.0.4 */
tmp = conf_alloc_string("general", "password", NULL); tmp = cfg_getstr(lib, "password");
snprintf(txtrecord[7], 128, "Password=%s", (tmp && (strlen(tmp) > 0)) ? "true" : "false"); snprintf(txtrecord[7], 128, "Password=%s", (tmp) ? "true" : "false");
if (tmp)
free(tmp);
srand((unsigned int)time(NULL)); srand((unsigned int)time(NULL));
@@ -566,7 +556,7 @@ int main(int argc, char *argv[]) {
DPRINTF(E_LOG,L_MAIN|L_REND,"Registering rendezvous names\n"); DPRINTF(E_LOG,L_MAIN|L_REND,"Registering rendezvous names\n");
port = conf_get_int("general", "port", 0); port = cfg_getint(lib, "port");
/* Register web server service */ /* Register web server service */
mdns_register(servername, "_http._tcp", port, txtrecord); mdns_register(servername, "_http._tcp", port, txtrecord);
@@ -578,8 +568,6 @@ int main(int argc, char *argv[]) {
for (i = 0; i < (sizeof(txtrecord) / sizeof(*txtrecord) - 1); i++) for (i = 0; i < (sizeof(txtrecord) / sizeof(*txtrecord) - 1); i++)
free(txtrecord[i]); free(txtrecord[i]);
free(servername);
/* Set up signal fd */ /* Set up signal fd */
sigfd = signalfd(-1, &sigs, SFD_NONBLOCK | SFD_CLOEXEC); sigfd = signalfd(-1, &sigs, SFD_NONBLOCK | SFD_CLOEXEC);
if (sigfd < 0) if (sigfd < 0)