Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
afb-session: Add function to enumerate sessions
[src/app-framework-binder.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
6432540
..
b8bad94
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-546,12
+546,6
@@
static void start(int signum, void *arg)
exit(1);
}
exit(1);
}
- // ------------------ sanity check ----------------------------------------
- if (config->httpdPort <= 0) {
- ERROR("no port is defined");
- goto error;
- }
-
/* set the directories */
mkdir(config->workdir, S_IRWXU | S_IRGRP | S_IXGRP);
if (chdir(config->workdir) < 0) {
/* set the directories */
mkdir(config->workdir, S_IRWXU | S_IRGRP | S_IXGRP);
if (chdir(config->workdir) < 0) {
@@
-568,10
+562,6
@@
static void start(int signum, void *arg)
ERROR("initialisation of session manager failed");
goto error;
}
ERROR("initialisation of session manager failed");
goto error;
}
- if (!afb_hreq_init_cookie(config->httpdPort, config->rootapi, config->cntxTimeout)) {
- ERROR("initialisation of cookies failed");
- goto error;
- }
main_apiset = afb_apiset_create("main", config->apiTimeout);
if (!main_apiset) {
ERROR("can't create main api set");
main_apiset = afb_apiset_create("main", config->apiTimeout);
if (!main_apiset) {
ERROR("can't create main api set");
@@
-616,6
+606,16
@@
static void start(int signum, void *arg)
/* start the HTTP server */
afb_debug("start-http");
if (!config->noHttpd) {
/* start the HTTP server */
afb_debug("start-http");
if (!config->noHttpd) {
+ if (config->httpdPort <= 0) {
+ ERROR("no port is defined");
+ goto error;
+ }
+
+ if (!afb_hreq_init_cookie(config->httpdPort, config->rootapi, config->cntxTimeout)) {
+ ERROR("initialisation of HTTP cookies failed");
+ goto error;
+ }
+
hsrv = start_http_server();
if (hsrv == NULL)
goto error;
hsrv = start_http_server();
if (hsrv == NULL)
goto error;