X-Git-Url: http://git.onelab.eu/?p=fprobe-ulog.git;a=blobdiff_plain;f=src%2Ffprobe-ulog.c;h=519bf8f8b244cc01d6b5b94ccffaa73fc2abe12a;hp=0896cb58d73ffa3455ad64d82366979bdf66878c;hb=3da127fa885b32dc4614f2f69bc3f72a17215a82;hpb=f42d3718eaa93d9efb2cfcb7cb455d7b8f4bc775

diff --git a/src/fprobe-ulog.c b/src/fprobe-ulog.c
index 0896cb5..519bf8f 100644
--- a/src/fprobe-ulog.c
+++ b/src/fprobe-ulog.c
@@ -217,6 +217,7 @@ static int sched_min, sched_max;
 static int npeers, npeers_rot;
 static struct peer *peers;
 static int sigs;
+static char cur_output_file[MAX_PATH_LEN];
 
 static struct Flow *flows[1 << HASH_BITS];
 static pthread_mutex_t flows_mutex[1 << HASH_BITS];
@@ -417,7 +418,7 @@ void update_cur_epoch_file(int n) {
 	int fd, len;
 	char snum[MAX_EPOCH_SIZE];
 	len=snprintf(snum, MAX_EPOCH_SIZE-1,"%d", n);
-	fd = open(LAST_EPOCH_FILE, O_RDWR|O_CREAT|O_TRUNC);
+	fd = open(LAST_EPOCH_FILE, O_RDWR|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH);
 	if (fd == -1) {
 		my_log(LOG_ERR, "open() failed: %s.The next restart will resume logging from epoch id 0.",LAST_EPOCH_FILE);
 		return;
@@ -466,20 +467,24 @@ unsigned get_data_file_fd(char *fname, int cur_fd) {
 	 * or we're starting up 
 	 * or we're going back to the first epoch */
 	if (((cur_uptime - prev_uptime) > epoch_length) || (cur_fd < 0) || (cur_epoch==-1)) {
-		char nextname[MAX_PATH_LEN];
 		int write_fd;
 		prev_uptime = cur_uptime;
 		cur_epoch = (cur_epoch + 1) % log_epochs;
 		if (cur_epoch>last_peak) last_peak = cur_epoch;
-		if (cur_fd>0)
+		if (cur_fd>0) {
 			close(cur_fd);
-		snprintf(nextname,MAX_PATH_LEN,"%s.%d",fname,cur_epoch);
-		if ((write_fd = open(nextname, O_RDWR|O_CREAT|O_TRUNC)) < 0) {
-			my_log(LOG_ERR, "open(): %s (%s)\n", nextname, strerror(errno));
+            /* Compress the finished file */
+            char gzip_cmd[MAX_PATH_LEN+sizeof("gzip -f ")]; 
+            snprintf(gzip_cmd, MAX_PATH_LEN+sizeof("gzip -f "),"gzip -f %s",cur_output_file);
+            system(gzip_cmd);
+        }
+		snprintf(cur_output_file,MAX_PATH_LEN,"%s.%d",fname,cur_epoch);
+		if ((write_fd = open(cur_output_file, O_RDWR|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH)) < 0) {
+			my_log(LOG_ERR, "open(): %s (%s)\n", cur_output_file, strerror(errno));
 			exit(1);
 		}
 		if (fchmod(write_fd,S_IRUSR|S_IWUSR|S_IROTH|S_IRGRP) == -1) {
-			my_log(LOG_ERR, "fchmod() failed: %s (%s). Continuing...\n", nextname, strerror(errno));
+			my_log(LOG_ERR, "fchmod() failed: %s (%s). Continuing...\n", cur_output_file, strerror(errno));
 		}
 		update_cur_epoch_file(cur_epoch);
 		ret_fd = write_fd;
@@ -819,7 +824,7 @@ void *emit_thread()
 	timeout.tv_nsec = 0;
 
 	setuser();
-
+        
 	for (;;) {
 		pthread_mutex_lock(&emit_mutex);
 		while (!flows_emit) {
@@ -827,6 +832,7 @@ void *emit_thread()
 			timeout.tv_sec = now.tv_sec + emit_timeout;
 			/* Do not wait until emit_packet will filled - it may be too long */
 			if (pthread_cond_timedwait(&emit_cond, &emit_mutex, &timeout) && emit_count) {
+                //my_log(LOG_INFO,"Timeout: %d, %d",emit_count, timeout.tv_sec);
 				pthread_mutex_unlock(&emit_mutex);
 				goto sendit;
 			}
@@ -876,7 +882,7 @@ sendit:
 #undef MESSAGES
 					}
 #if ((DEBUG) & DEBUG_E)
-					commaneelse {
+					else {
 						my_log(LOG_DEBUG, "E: Emitted %d flow(s) to #%d, seq %d",
 								emit_count, i + 1, peers[i].seq);
 					}
@@ -911,7 +917,7 @@ sendreal:
 #endif
 								}
 #if ((DEBUG) & DEBUG_E)
-								commaneelse {
+								else {
 									my_log(LOG_DEBUG, "E: Emitted %d flow(s) to #%d, seq %d",
 											emit_count, i + 1, peers[i].seq);
 								}