Support 'logpath' flag to change log path

The "logpath" indicates log path atop writes. Users can define this
flag in atoprc to change the logpath according to their own needs.
This is meaningful especially to avoid the system disk being fully
occupied.

Signed-off-by: Fei Li <[email protected]>

Author: ShirleyFei

atop.c

@@ -312,6 +312,7 @@ unsigned long 	sampcnt;
 char		screen;
 int		linelen  = 80;
 int		generations = 28; /* By default, keep recent 30 days' log */
+char		logpath[256] = "/var/log/atop"; /*support writing to other paths, to avoid system disk being fully occupied */
 char		acctreason;	/* accounting not active (return val) 	*/
 char		rawname[RAWNAMESZ];
 char		rawreadflag;
@@ -354,6 +355,7 @@ void do_flags(char *, char *);
 void do_interval(char *, char *);
 void do_linelength(char *, char *);
 void do_generations(char *, char *);
+void do_logpath(char *, char *);
 void do_username(char *, char *);
 void do_procname(char *, char *);
 void do_maxcpu(char *, char *);
@@ -406,6 +408,7 @@ static struct {
 	{	"interval",		do_interval,		0, },
 	{	"linelen",		do_linelength,		0, },
 	{	"generations",		do_generations,		0, },
+	{	"logpath",		do_logpath,		0, },
 	{	"username",		do_username,		0, },
 	{	"procname",		do_procname,		0, },
 	{	"maxlinecpu",		do_maxcpu,		0, },
@@ -1164,6 +1167,15 @@ do_generations(char *name, char *val)
 	generations = get_posval(name, val);
 }
 
+void
+do_logpath(char *name, char *val)
+{
+	//For safety purpose, check logpath's permission
+	check_file_perm(val);
+
+	strcpy(logpath, val);
+}
+
 /*
 ** read RC-file and modify defaults accordingly
 */

atop.daily

@@ -60,11 +60,25 @@ if [ -f $ATOPRC ]; then
 	fi
 fi
 
+#e.g. logpath /data00/log/atop
+ATOPRC="/etc/atoprc"
+if [ -f $ATOPRC ]; then
+	RCLOGPATH=`cat $ATOPRC | grep -w '^logpath' -m 1 | awk '{print $2}'`
+	if [ -n "$RCLOGPATH" ]; then
+		LOGPATH=$RCLOGPATH
+		mkdir -p $LOGPATH
+	fi
+fi
+
 # delete logfiles older than N days (configurable)
 # start a child shell that activates another child shell in
 # the background to avoid a zombie
 #
 ( (sleep 3; find "$LOGPATH" -name 'atop_*' -mtime +"$LOGGENERATIONS" -exec rm {} \;)& )
+# In case we change the logpath, ensure consistent log storage status
+if [ "$LOGPATH" != "/var/log/atop" ];then
+    ( (sleep 3; find "/var/log/atop" -name 'atop_*' -mtime +"$LOGGENERATIONS" -exec rm {} \;)& )
+fi
 
 # activate atop with an interval of S seconds (configurable),
 # replacing the current shell

atop.h

@@ -90,6 +90,7 @@ extern char		rawname[];
 extern char		rawreadflag;
 extern time_t		begintime, endtime, cursortime;	// epoch or time in day
 extern char		flaglist[];
+extern char		logpath[];
 extern struct visualize vis;
 
 extern int      	osrel;

man/atoprc.5

@@ -47,6 +47,10 @@ The length of a screen line when sending output to a file or pipe (default 80).
 The number of day logs need to keep, considering disk space usage and other needs.
 .PP
 .TP 4
+.B logpath
+The log path atop writes to. This is meaningful especially to avoid the root directory being fully occupied.
+.PP
+.TP 4
 .B username
 The default regular expression for the users for which active
 processes will be shown.
@@ -238,6 +242,8 @@ interval\ \ \ \ \ \ 5
 .br
 generations\ \ \ 3
 .br
+logpath\ \ \ \ \ \ \ /data00/log/atop
+.br
 username
 .br
 procname

rawlog.c

@@ -53,7 +53,6 @@
 #include "photosyst.h"
 #include "rawlog.h"
 
-#define	BASEPATH	"/var/log/atop"  
 #define	BINPATH		"/usr/bin/atop"
 
 static int	getrawrec  (int, struct rawrecord *, int);
@@ -330,7 +329,7 @@ rawread(void)
 		tp	= localtime(&timenow);
 
 		snprintf(rawname, RAWNAMESZ, "%s/atop_%04d%02d%02d",
-			BASEPATH, 
+			logpath,
 			tp->tm_year+1900,
 			tp->tm_mon+1,
 			tp->tm_mday);
@@ -352,7 +351,7 @@ rawread(void)
 			strcpy(savedname, rawname); // no overflow (len=8)
 
 			snprintf(rawname, RAWNAMESZ, "%s/atop_%s",
-				BASEPATH, 
+				logpath,
 				savedname);
 			break;
 		}
@@ -384,7 +383,7 @@ rawread(void)
 			tp	 = localtime(&timenow);
 
 			snprintf(rawname, RAWNAMESZ, "%s/atop_%04d%02d%02d",
-				BASEPATH, 
+				logpath,
 				tp->tm_year+1900,
 				tp->tm_mon+1,
 				tp->tm_mday);