From b80973cbd05664dc10a15ae3306726daa335997c Mon Sep 17 00:00:00 2001
From: Loic Guegan <manzerbredes@mailbox.org>
Date: Sat, 15 Jul 2023 13:54:03 +0200
Subject: [PATCH] Minor changes

---
 Makefile        |  5 ++++-
 config.mk       |  6 +++++-
 jean            |  0
 src/logger.c    |  2 +-
 src/publisher.c | 10 +++++-----
 5 files changed, 15 insertions(+), 8 deletions(-)
 delete mode 100644 jean

diff --git a/Makefile b/Makefile
index 18113c9..a4f0315 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,10 @@ client: src/client.c
 logger: src/logger.c src/utils.c
 	$(CC) $^ -o $@
 
+start: publisher client
+	$(error "Not yet implemented")
+
 clean:
 	rm -f logger client publisher
 
-.PHONY: clean publisher client logger
+.PHONY: clean publisher client logger start
diff --git a/config.mk b/config.mk
index f37dfdf..3b19465 100644
--- a/config.mk
+++ b/config.mk
@@ -1,3 +1,7 @@
+##### ZeroMQ
 PUBLISHER_PORT=5556
 PUBLISHER_ADDR=localhost
-LOGGER_DIR=./logs
\ No newline at end of file
+
+##### Logger/Publisher
+LOGGERS_DIR=./logs
+LOG_INTERVAL=30
\ No newline at end of file
diff --git a/jean b/jean
deleted file mode 100644
index e69de29..0000000
diff --git a/src/logger.c b/src/logger.c
index 3ba934e..8798db4 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -60,7 +60,7 @@ int main (int argc, char *argv [])
   int power;
   time_t interval;
 
-  for(int i=0;i<1;i++){
+  while(1){
     interval=INTERVAL(__loginterval);
     *logfilepath='\0';
     sprintf(logfilepath,"%s/%ld",__logdir,interval);
diff --git a/src/publisher.c b/src/publisher.c
index 0068a56..bc1af69 100644
--- a/src/publisher.c
+++ b/src/publisher.c
@@ -40,11 +40,11 @@ int main (int argc, char *argv [])
     }
 
     //----- Start publisher
-    DIR *dr = opendir(__logdir);
     struct dirent *de;  // Pointer for directory entry
-    for(int i=0;i<=0;i++){
+    while(1){
         int interval=INTERVAL(__loginterval);
         int interval_next=INTERVAL_NEXT(__loginterval);
+        DIR *dr = opendir(__logdir);
         while ((de = readdir(dr)) != NULL){
             if(strcmp(de->d_name,".") && strcmp(de->d_name,"..")){
                 char *client=de->d_name;
@@ -61,12 +61,12 @@ int main (int argc, char *argv [])
                 // Send current one
                 if(FILE_EXISTS(logfile)){
                     publish(logfile,client,interval);
+                    remove(logfile);
                 }
             }
         }
+        closedir(dr);
     }
-    closedir(dr);
-    
 
     zmq_close (publisher);
     zmq_ctx_destroy (context);
@@ -89,5 +89,5 @@ int main (int argc, char *argv [])
 }
 
 void publish(char *filepath, char* client, int interval){
-
+    printf("Publish!\n");
 }
\ No newline at end of file