X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=8ed87e8139a22a5630f30b8159881a68c1b9ca7d;hb=73de4a553c122a608ca9ee401e306fc3ab03c03a;hp=67d268c0ff0a3d6acb2fbfbe7c2b6d8559d02905;hpb=9ad5a0f58f2100af146c17be676a5de7438c1ede;p=psensor.git

diff --git a/src/server/server.c b/src/server/server.c
index 67d268c..8ed87e8 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -151,9 +151,7 @@ file_reader(void *cls, uint64_t pos, char *buf, int max)
 }
 
 static struct MHD_Response *
-create_response_api(const char *nurl,
-		    const char *method,
-		    unsigned int *rp_code)
+create_response_api(const char *nurl, const char *method, unsigned int *rp_code)
 {
 	struct MHD_Response *resp;
 	struct psensor *s;
@@ -199,11 +197,10 @@ create_response_api(const char *nurl,
 	return NULL;
 }
 
-static struct MHD_Response *
-create_response_file(const char *nurl,
-		     const char *method,
-		     unsigned int *rp_code,
-		     const char *fpath)
+static struct MHD_Response *create_response_file(const char *nurl,
+						 const char *method,
+						 unsigned int *rp_code,
+						 const char *fpath)
 {
 	struct stat st;
 	int ret;
@@ -264,14 +261,13 @@ create_response(const char *nurl, const char *method, unsigned int *rp_code)
 	}
 }
 
-static int
-cbk_http_request(void *cls,
-		 struct MHD_Connection *connection,
-		 const char *url,
-		 const char *method,
-		 const char *version,
-		 const char *upload_data,
-		 size_t *upload_data_size, void **ptr)
+static int cbk_http_request(void *cls,
+			    struct MHD_Connection *connection,
+			    const char *url,
+			    const char *method,
+			    const char *version,
+			    const char *upload_data,
+			    size_t *upload_data_size, void **ptr)
 {
 	static int dummy;
 	struct MHD_Response *response;
@@ -313,7 +309,7 @@ cbk_http_request(void *cls,
 int main(int argc, char *argv[])
 {
 	struct MHD_Daemon *d;
-	int port, opti, optc, cmdok;
+	int port, opti, optc, cmdok, ret;
 	char *log_file, *slog_file;
 
 	program_name = argv[0];
@@ -408,8 +404,11 @@ int main(int argc, char *argv[])
 	log_info(_("WWW directory: %s"), server_data.www_dir);
 	log_info(_("URL: http://localhost:%d"), port);
 
-	if (slog_file)
-		slog_init(slog_file, server_data.sensors);
+	if (slog_file) {
+		ret = slog_activate(slog_file, server_data.sensors, &mutex, 5);
+		if (!ret)
+			log_err(_("Failed to activate logging of sensors."));
+	}
 
 	while (!server_stop_requested) {
 		pthread_mutex_lock(&mutex);
@@ -422,8 +421,6 @@ int main(int argc, char *argv[])
 
 		psensor_log_measures(server_data.sensors);
 
-		slog_write_sensors(server_data.sensors);
-
 		pthread_mutex_unlock(&mutex);
 		sleep(5);
 	}