diff --git a/.gitignore b/.gitignore index 4df076a..ea247f6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ # Caches /logs -/data \ No newline at end of file +/data +/pid \ No newline at end of file diff --git a/Makefile b/Makefile index b08b9cd..e17d8d7 100644 --- a/Makefile +++ b/Makefile @@ -15,8 +15,9 @@ logger: src/logger.c src/utils.c $(CC) $^ -o $@ publish: publisher logger - ./logger $(LOGGERS_DIR) 587 $(LOG_INTERVAL) & - ./publisher $(LOGGERS_DIR) $(LOG_INTERVAL) $(SUBSCRIBER_ADDR) $(ZMQ_PORT) $(KEY) & + rm -f pid + ./logger $(LOGGERS_DIR) 587 $(LOG_INTERVAL) &> $(LOGGERS_DIR)/587.log & echo $$! >> pid + ./publisher $(LOGGERS_DIR) $(LOG_INTERVAL) $(SUBSCRIBER_ADDR) $(ZMQ_PORT) $(KEY) subscribe: subscriber ./subscriber $(ZMQ_PORT) $(SUBSCRIBER_DIR) diff --git a/src/logger.c b/src/logger.c index 0a3278e..a698a0d 100644 --- a/src/logger.c +++ b/src/logger.c @@ -70,7 +70,7 @@ int main (int argc, char *argv []) fprintf(logptr,"%ld,%d\n",TIMESTAMP(),power); fseek(regptr,0,SEEK_SET); sleep(1); - printf("Tick\n"); + printf("Tick\n"); fflush(stdout); } fclose(logptr); } diff --git a/src/publisher.c b/src/publisher.c index e216232..7c401c4 100644 --- a/src/publisher.c +++ b/src/publisher.c @@ -62,7 +62,7 @@ int main (int argc, char *argv []) // Send current one if(FILE_EXISTS(logfile)){ publish(publisher,logfile,client,interval); - //remove(logfile); + remove(logfile); } } }