Merge pull request #5 from nanopack/feature/truncate

Add ability to truncate files when they reach a limit

configure.ac

@@ -2,7 +2,7 @@
 
 AC_PREREQ(2.61)
 
-AC_INIT([narcd], [0.2.1])
+AC_INIT([narcd], [0.2.2])
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 AC_CONFIG_SRCDIR([src/narc.c])
 

src/config.c

@@ -234,7 +234,9 @@ load_server_config_from_string(char *config)
 			server.rate_limit = atoi(argv[1]);
 		} else if (!strcasecmp(argv[0],"rate-time") && argc == 2) {
 			server.rate_time = atoi(argv[1]);
-		}  else {
+		} else if (!strcasecmp(argv[0],"truncate-limit") && argc == 2) {
+			server.truncate_limit = atoi(argv[1]);
+		} else {
 			err = "Bad directive or wrong number of arguments"; goto loaderr;
 		}
 		sdsfreesplitres(argv,argc);

src/narc.c

@@ -164,6 +164,7 @@ init_server_config(void)
 	server.connect_retry_delay = NARC_DEFAULT_CONNECT_DELAY;
 	server.rate_limit = NARC_DEFAULT_RATE_LIMIT;
 	server.rate_time = NARC_DEFAULT_RATE_TIME;
+	server.truncate_limit = NARC_DEFAULT_TRUNCATE_LIMIT;
 	server.streams = listCreate();
 	listSetFreeMethod(server.streams, free_stream);
 }

src/narc.h

@@ -68,6 +68,7 @@
 #define NARC_DEFAULT_CONNECT_DELAY	3000
 #define NARC_DEFAULT_RATE_LIMIT		100
 #define NARC_DEFAULT_RATE_TIME		10
+#define NARC_DEFAULT_TRUNCATE_LIMIT	1024*1024*32 /* Default truncate files when they get to 32MB */
 
 /* Log levels */
 #define NARC_DEBUG		0
@@ -125,6 +126,7 @@ struct narc_server {
 	int 		stream_priority;		/* Syslog stream priority */
 	int			rate_limit;				/* log rate limit */
 	int			rate_time;				/* log rate time */
+	int			truncate_limit;			/* size limit for truncating */
 
 	/* Time of day */
 	uv_timer_t 	time_timer;				/* runs ever hald second to update the current time */

src/stream.c

@@ -33,6 +33,9 @@
 #include <stdio.h>	/* standard buffered input/output */
 #include <stdlib.h>	/* standard library definitions */
 #include <unistd.h>	/* standard symbolic constants and types */
+#include <errno.h>
+#include <string.h>
+#include <sys/types.h>
 #include <uv.h>		/* Event driven programming library */
 #include <string.h>	/* string operations */
 
@@ -207,6 +210,11 @@ handle_file_stat(uv_fs_t* req)
 			stream->offset = 0;
 		}
 
+		// does the file need to be truncated?
+		if ((long int)stat->st_size > (long int)server.truncate_limit){
+			stream->truncate = 1;
+		}
+
 		stream->size = stat->st_size;
 
 		start_file_read(stream);
@@ -276,6 +284,13 @@ handle_file_read(uv_fs_t *req)
 		}
 	}
 
+	if (stream->truncate == 1) {
+		if (truncate(stream->file, 0) == -1) {
+			narc_log(NARC_WARNING, "Truncate error (%s): %s", stream->file, strerror(errno));
+		}
+		stream->truncate = 0;
+	}
+
 	unlock_stream(stream);
 
 	if (req->result == NARC_MAX_BUFF_SIZE -1)

src/stream.h

@@ -54,6 +54,7 @@ typedef struct {
 	int	missed_count;				/*  */
 	int     message_header_size;
 	int64_t offset;
+	int		truncate;
 	uv_fs_event_t *fs_events;
 	uv_timer_t *open_timer;
 } narc_stream;

src/version.h

@@ -1 +1 @@
-#define NARC_VERSION "0.0.1"
+#define NARC_VERSION "0.2.2"