MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-27 06:33:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Enable new HTTP server alongside the old webserver

Browse Source
This commit is contained in:
Julien BLACHE 2009-04-22 21:25:53 +02:00
parent 095350e6eb
commit 9d1cd9117f
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.c
View File

@ -87,6 +87,7 @@
#include "configfile.h" #include "configfile.h"
#include "err.h" #include "err.h"
#include "filescanner.h" #include "filescanner.h"
#include "httpd.h"
#include "webserver.h" #include "webserver.h"
#include "db-generic.h" #include "db-generic.h"
#include "plugin.h" #include "plugin.h"
@ -669,6 +670,17 @@ int main(int argc, char *argv[]) {
ws_registerhandler(config.server, "/",main_handler,main_auth, ws_registerhandler(config.server, "/",main_handler,main_auth,
0,1); 0,1);
/* Spawn HTTPd thread */
ret = httpd_init();
if (ret != 0)
{
DPRINTF(E_FATAL, L_MAIN, "HTTPd thread failed to start\n");
mdns_deinit();
db_deinit();
exit(EXIT_FAILURE);
}
/* Register mDNS services */ /* Register mDNS services */
servername = conf_get_servername(); servername = conf_get_servername();
@ -679,6 +691,7 @@ int main(int argc, char *argv[]) {
{ {
DPRINTF(E_FATAL, L_MAIN, "Out of memory for TXT record\n"); DPRINTF(E_FATAL, L_MAIN, "Out of memory for TXT record\n");
httpd_deinit();
filescanner_deinit(); filescanner_deinit();
mdns_deinit(); mdns_deinit();
db_deinit(); db_deinit();
@ -741,6 +754,7 @@ int main(int argc, char *argv[]) {
{ {
DPRINTF(E_FATAL, L_MAIN, "Could not setup signalfd: %s\n", strerror(errno)); DPRINTF(E_FATAL, L_MAIN, "Could not setup signalfd: %s\n", strerror(errno));
httpd_deinit();
filescanner_deinit(); filescanner_deinit();
mdns_deinit(); mdns_deinit();
db_deinit(); db_deinit();
@ -756,6 +770,9 @@ int main(int argc, char *argv[]) {
DPRINTF(E_LOG,L_MAIN,"Stopping gracefully\n"); DPRINTF(E_LOG,L_MAIN,"Stopping gracefully\n");
DPRINTF(E_LOG, L_MAIN, "HTTPd deinit\n");
httpd_deinit();
DPRINTF(E_LOG, L_MAIN, "File scanner deinit\n"); DPRINTF(E_LOG, L_MAIN, "File scanner deinit\n");
filescanner_deinit(); filescanner_deinit();