From 1af62bfcacd384f9bfa3dd61ede41fd1cf7768e8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh>
Date: Wed, 7 Feb 2018 11:27:52 +0100
Subject: [PATCH] main: Isolate HTTP initialization
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Initializations linked to HTTP are deferred
until starting the HTTP server.

Change-Id: I917c4c5db3c3ae894ee60fd16b9e09d4185fcdb4
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---
 src/main.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main.c b/src/main.c
index 64325400..b8bad945 100644
--- a/src/main.c
+++ b/src/main.c
@@ -546,12 +546,6 @@ static void start(int signum, void *arg)
 		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) {
@@ -568,10 +562,6 @@ static void start(int signum, void *arg)
 		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");
@@ -616,6 +606,16 @@ static void start(int signum, void *arg)
 	/* 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;
-- 
2.16.6