github/recorder
1
0
Fork 0
mirror of https://github.com/owntracks/recorder.git synced 2026-04-05 00:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: recorder: remove global mgserver & rename udata element

Browse Source
This commit is contained in:
Jan-Piet Mens
2015-09-03 19:11:20 +02:00
parent 3548c000bf
commit 719d82ee44
2 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ot-recorder.c
View File

@@ -59,9 +59,6 @@
#define CLEAN_SESSION false
static int run = 1;
#ifdef HAVE_HTTP
static struct mg_server *mgserver;
#endif
double number(JsonNode *j, char *element)
{
@@ -390,8 +387,8 @@ void on_message(struct mosquitto *mosq, void *userdata, const struct mosquitto_m
monitorhook(ud, now, m->topic);
#ifdef HAVE_HTTP
if (ud->server) {
http_ws_push(ud->server, m->payload);
if (ud->mgserver) {
http_ws_push(ud->mgserver, m->payload);
}
#endif
@@ -710,7 +707,7 @@ int main(int argc, char **argv)
udata.gc = NULL;
#endif
#ifdef HAVE_HTTP
mgserver = udata.server = NULL;
udata.mgserver = NULL;
#endif
if ((p = getenv("OTR_HOST")) != NULL) {
@@ -830,7 +827,8 @@ int main(int argc, char **argv)
syslog(LOG_ERR, "%s is not a directory", doc_root);
exit(1);
}
mgserver = udata.server = mg_create_server(NULL, ev_handler);
/* First arg is user data which I can grab via conn->server_param */
udata.mgserver = mg_create_server(ud, ev_handler);
}
#endif
syslog(LOG_DEBUG, "starting");
@@ -934,18 +932,18 @@ int main(int argc, char **argv)
sprintf(address, "%s:%d", http_host, http_port);
mg_set_option(udata.server, "listening_port", address);
// mg_set_option(udata.server, "listening_port", "8090,ssl://8091:cert.pem");
mg_set_option(udata.mgserver, "listening_port", address);
// mg_set_option(udata.mgserver, "listening_port", "8090,ssl://8091:cert.pem");
// mg_set_option(udata.server, "ssl_certificate", "cert.pem");
// mg_set_option(udata.server, "listening_port", "8091");
// mg_set_option(udata.mgserver, "ssl_certificate", "cert.pem");
// mg_set_option(udata.mgserver, "listening_port", "8091");
mg_set_option(udata.server, "document_root", doc_root);
mg_set_option(udata.server, "enable_directory_listing", "yes");
// mg_set_option(udata.server, "access_log_file", "access.log");
// mg_set_option(udata.server, "cgi_pattern", "**.cgi");
mg_set_option(udata.mgserver, "document_root", doc_root);
mg_set_option(udata.mgserver, "enable_directory_listing", "yes");
// mg_set_option(udata.mgserver, "access_log_file", "access.log");
// mg_set_option(udata.mgserver, "cgi_pattern", "**.cgi");
syslog(LOG_INFO, "HTTP listener started on %s", mg_get_option(udata.server, "listening_port"));
syslog(LOG_INFO, "HTTP listener started on %s", mg_get_option(udata.mgserver, "listening_port"));
}
#endif
@@ -958,14 +956,14 @@ int main(int argc, char **argv)
mosquitto_reconnect(mosq);
}
#ifdef HAVE_HTTP
if (udata.server) {
mg_poll_server(udata.server, 50);
if (udata.mgserver) {
mg_poll_server(udata.mgserver, 50);
}
#endif
}
#ifdef HAVE_HTTP
mg_destroy_server(&udata.server);
mg_destroy_server(&udata.mgserver);
#endif
mosquitto_disconnect(mosq);

2
udata.h
View File

@@ -23,7 +23,7 @@ struct udata {
struct gcache *gc;
#endif
#ifdef HAVE_HTTP
struct mg_server *server;
struct mg_server *mgserver; /* Mongoose */
#endif
};