X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=prometheus.c;h=5288dfe8c8fcdc4fe1890dc1a094e284e756d8e0;hb=add90548f6187d4aa23675f2acf77b149327b5a4;hp=0870bcec81a9239e117d95310c2b301c0022e77f;hpb=e64e760d50046e48f3520045970878a4687a19e2;p=svn%2FPrometheus-QoS%2F.git diff --git a/prometheus.c b/prometheus.c index 0870bce..5288dfe 100644 --- a/prometheus.c +++ b/prometheus.c @@ -895,7 +895,7 @@ void parse_ip_log(int argc, char **argv) } } sprintf(str,"%s/%s-%s.html",html_log_dir,year,month); - printf("Writing %s ...",str); + printf("Writing %s ... ",str); f=fopen(str,"w"); if(f) { @@ -1030,8 +1030,35 @@ void parse_ip_log(int argc, char **argv) fclose(f); puts(" done."); } + else + { + perror(str); + } +} + +void append_log(struct IP *self) /*using global variables*/ +{ + char *d, *str; + FILE *f; + + date(d); /* this is typical cll1.h macro - prints current date */ + string(str,STRLEN); + sprintf(str,"%s/%s.log", log_dir, self->name); + f=fopen(str,"a"); + if(f) + { + fprintf(f,"%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%d\t%s", + time(NULL), self->name, self->traffic, self->direct, self->proxy, + self->upload, self->min, self->max, self->desired, self->lmsid, d); /* d = date*/ + fclose(f); + } + else + { + perror(str); + } } + /*-----------------------------------------------------------------*/ /* Are you looking for int main(int argc, char **argv) ? :-)) */ /*-----------------------------------------------------------------*/ @@ -1448,7 +1475,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); if(just_flush) { fclose(iptables_file); - if(log_file) fclose(log_file); + if(log_file) + { + fclose(log_file); + } puts("Just flushed iptables and tc classes - now exiting ..."); exit(0); } @@ -1592,10 +1622,11 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); } else if(!dry_run && !just_flush) { + const char *previous="/var/run/prometheus.previous"; /*-----------------------------------------------------------------*/ - printf("Writing data transfer database ...\n"); + printf("Writing data transfer database %s ... ", previous); /*-----------------------------------------------------------------*/ - f=fopen("/var/run/prometheus.previous","w"); + f=fopen(previous,"w"); if(f) { for_each(ip,ips) @@ -1607,6 +1638,11 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); } } fclose(f); + puts(" done."); + } + else + { + perror(previous); } f=fopen(html,"w"); ptr=html; @@ -1646,9 +1682,9 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); fprintf(f, "