loic/ina260-zmq-publisher
1
0
Fork 0
mirror of https://gitlab.com/manzerbredes/ina260-zmq-publisher.git synced 2025-04-10 08:20:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor changes

Browse source
This commit is contained in:
Loic Guegan 2023-07-15 22:06:22 +02:00
parent adee9af472
commit 9f4eb5b6b8
1 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/publisher.c
View file

@ -17,7 +17,6 @@ void publish(void *publisher, char *filepath, char* client, long int interval);
int main (int argc, char *argv []) int main (int argc, char *argv [])
{ {
printf("%s\n",ZMQ_TOKEN);
if(argc != 6){ if(argc != 6){
printf("Usage: %s <abslogdir> <loginterval> <ip> <port> <key>",argv[0]); printf("Usage: %s <abslogdir> <loginterval> <ip> <port> <key>",argv[0]);
exit(1); exit(1);
@ -37,7 +36,7 @@ int main (int argc, char *argv [])
sprintf(bindto,"tcp://%s:%d",__ip,__port); sprintf(bindto,"tcp://%s:%d",__ip,__port);
int rc = zmq_connect (publisher, bindto); int rc = zmq_connect (publisher, bindto);
if(rc!=0){ if(rc!=0){
printf("Failed to bind zmq on %s\n",bindto); printf("Failed to connect to %s\n",bindto);
exit(1); exit(1);
} }
@ -47,6 +46,7 @@ int main (int argc, char *argv [])
int interval=INTERVAL(__loginterval); int interval=INTERVAL(__loginterval);
int interval_next=INTERVAL_NEXT(__loginterval); int interval_next=INTERVAL_NEXT(__loginterval);
DIR *dr = opendir(__logdir); DIR *dr = opendir(__logdir);
if(dr !=NULL){
while ((de = readdir(dr)) != NULL){ while ((de = readdir(dr)) != NULL){
if(strcmp(de->d_name,".") && strcmp(de->d_name,"..")){ if(strcmp(de->d_name,".") && strcmp(de->d_name,"..")){
char *client=de->d_name; char *client=de->d_name;
@ -56,7 +56,7 @@ int main (int argc, char *argv [])
sprintf(logfile_next,"%s/%s/%ld",__logdir,client,interval_next); sprintf(logfile_next,"%s/%s/%ld",__logdir,client,interval_next);
// As long as next logfile is not available, we should wait // As long as next logfile is not available, we should wait
// for sending the current one // for sending the current one
printf("Waiting for %s...%s\n",client,logfile_next); printf("Waiting for %s logger measurements...\n",client);
while(!FILE_EXISTS(logfile_next)){ while(!FILE_EXISTS(logfile_next)){
sleep(1); sleep(1);
} }
@ -69,6 +69,10 @@ int main (int argc, char *argv [])
} }
closedir(dr); closedir(dr);
} }
else {
sleep(1);
}
}
zmq_close (publisher); zmq_close (publisher);
zmq_ctx_destroy (context); zmq_ctx_destroy (context);
@ -77,7 +81,7 @@ int main (int argc, char *argv [])
} }
void publish(void *publisher, char *filepath, char* client, long int interval){ void publish(void *publisher, char *filepath, char* client, long int interval){
printf("Publish!\n"); printf("Publishing %s measurements\n",client);
char buffer[ZMQ_MSG_SIZE]; char buffer[ZMQ_MSG_SIZE];
sprintf(buffer,"%s\n%s\n%s\n%ld\n",ZMQ_TOKEN,__key,client,interval); sprintf(buffer,"%s\n%s\n%s\n%ld\n",ZMQ_TOKEN,__key,client,interval);
int msglen=strlen(buffer); int msglen=strlen(buffer);