lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 01:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Netflow insight, regressions in rotate(), for https://github.com/opnsense/core/issues/2964

Browse Source
This commit is contained in:
Ad Schellevis 2018-11-29 13:36:51 +01:00
parent 2481b62ca8
commit 711e1d9da4
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/opnsense/scripts/netflow/flowd_aggregate.py
View File

@ -87,7 +87,7 @@ def aggregate_flowd(config, do_vacuum=False):
del metadata
def check_rotate(filename, pid_filename):
def check_rotate(filename):
""" Checks if flowd log needs to be rotated, if so perform rotate.
We keep [MAX_LOGS] number of logs containing approx. [MAX_FILE_SIZE_MB] data, the flowd data probably contains
more detailed data then the stored aggregates.
@ -95,23 +95,23 @@ def check_rotate(filename, pid_filename):
:param pid_filename: filename of pid
:return: None
"""
if os.path.getsize(filename)/1024/1024 > MAX_FILE_SIZE_MB:
if os.path.exists(filename) and os.path.getsize(filename)/1024/1024 > MAX_FILE_SIZE_MB:
# max filesize reached rotate
filenames = sorted(glob.glob('%s.*' % filename), reverse=True)
file_sequence = len(filenames)
for filename in filenames:
sequence = filename.split('.')[-1]
for mfilename in filenames:
sequence = mfilename.split('.')[-1]
if sequence.isdigit():
if file_sequence >= MAX_LOGS:
os.remove(filename)
os.remove(mfilename)
elif int(sequence) != 0:
os.rename(filename, filename.replace('.%s' % sequence, '.%06d' % (int(sequence)+1)))
os.rename(mfilename, mfilename.replace('.%s' % sequence, '.%06d' % (int(sequence)+1)))
file_sequence -= 1
# rename flowd.log
os.rename(filename, '%s.000001' % filename)
# signal flowd for new log file
if os.path.isfile(pid_filename):
pid = open(pid_filename).read().strip()
if os.path.isfile('/var/run/flowd.pid'):
pid = open('/var/run/flowd.pid').read().strip()
if pid.isdigit():
try:
os.kill(int(pid), signal.SIGUSR1)
@ -162,7 +162,7 @@ class Main(object):
syslog.syslog(syslog.LOG_ERR, 'flowd aggregate died with message %s' % (traceback.format_exc()))
return
# rotate if needed
check_rotate(self.config.flowd_source, self.config.pid_filename)
check_rotate(self.config.flowd_source)
# wait for next pass, exit on sigterm
if Main.config.single_pass: